• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 268098d8
    Michael Niedermayer authored
    * qatar/master: (29 commits)
      amrwb: remove duplicate arguments from extrapolate_isf().
      amrwb: error out early if mode is invalid.
      h264: change underread for 10bit QPEL to overread.
      matroska: check buffer size for RM-style byte reordering.
      vp8: disable mmx functions with sse/sse2 counterparts on x86-64.
      vp8: change int stride to ptrdiff_t stride.
      wma: fix invalid buffer size assumptions causing random overreads.
      Windows Media Audio Lossless decoder
      rv10/20: Fix slice overflow with checked bitstream reader.
      h263dec: Disallow width/height changing with frame threads.
      rv10/20: Fix a buffer overread caused by losing track of the remaining buffer size.
      rmdec: Honor .RMF tag size rather than assuming 18.
      g722: Fix the QMF scaling
      r3d: don't set codec timebase.
      electronicarts: set timebase for tgv video.
      electronicarts: parse the framerate for cmv video.
      ogg: don't set codec timebase
      electronicarts: don't set codec timebase
      avs: don't set codec timebase
      wavpack: Fix an integer overflow
      ...
    
    Conflicts:
    	libavcodec/arm/vp8dsp_init_arm.c
    	libavcodec/fraps.c
    	libavcodec/h264.c
    	libavcodec/mpeg4videodec.c
    	libavcodec/mpegvideo.c
    	libavcodec/msmpeg4.c
    	libavcodec/pnmdec.c
    	libavcodec/qpeg.c
    	libavcodec/rawenc.c
    	libavcodec/ulti.c
    	libavcodec/vcr1.c
    	libavcodec/version.h
    	libavcodec/wmalosslessdec.c
    	libavformat/electronicarts.c
    	libswscale/ppc/yuv2rgb_altivec.c
    	tests/ref/acodec/g722
    	tests/ref/fate/ea-cmv
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    268098d8
Changelog 32 KB