* qatar/master: ARM: allow runtime masking of CPU features dsputil: remove unused functions mov: Treat keyframe indexes as 1-origin if starting at non-zero. mov: Take stps entries into consideration also about key_off. Remove lowres video decoding Conflicts: ffmpeg.c ffplay.c libavcodec/arm/vp8dsp_init_arm.c libavcodec/libopenjpegdec.c libavcodec/mjpegdec.c libavcodec/mpegvideo.c libavcodec/utils.c libavformat/mov.c
Showing the changes to libavcodec/alpha (1 of 52 files). Show all
Unified · Split
| @@ -336,7 +336,7 @@ void ff_dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx) · 335 unmodified lines | |||
| 336 | put_pixels_clamped_axp_p = c->put_pixels_clamped; | 336 | put_pixels_clamped_axp_p = c->put_pixels_clamped; |
| 337 | add_pixels_clamped_axp_p = c->add_pixels_clamped; | 337 | add_pixels_clamped_axp_p = c->add_pixels_clamped; |
| 338 | 338 | ||
| 339 | if (!avctx->lowres && avctx->bits_per_raw_sample <= 8 && | 339 | if (avctx->bits_per_raw_sample <= 8 && |
| 340 | (avctx->idct_algo == FF_IDCT_AUTO || | 340 | (avctx->idct_algo == FF_IDCT_AUTO || |
| 341 | avctx->idct_algo == FF_IDCT_SIMPLEALPHA)) { | 341 | avctx->idct_algo == FF_IDCT_SIMPLEALPHA)) { |
| 342 | c->idct_put = ff_simple_idct_put_axp; | 342 | c->idct_put = ff_simple_idct_put_axp; |