• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 92ef4be4
    Michael Niedermayer authored
    * 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
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    92ef4be4
mxpegdec.c 11.2 KB