• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 3edff185
    Michael Niedermayer authored
    * qatar/master: (21 commits)
      ipmovie: do not read audio packets before the codec is known
      truemotion2: check size before GetBitContext initialisation
      avio: Only do implicit network initialization for network protocols
      avio: Add an URLProtocol flag for indicating that a protocol uses network
      adpcm: ADPCM Electronic Arts has always two channels
      matroskadec: Fix a bug where a pointer was cached to an array that might later move due to a realloc()
      fate: Add missing reference file from 9b4767e4.
      mov: Support MOV_CH_LAYOUT_USE_DESCRIPTIONS for labeled descriptions.
      4xm: Prevent buffer overreads.
      mjpegdec: parse RSTn to prevent skipping other data in mjpeg_decode_scan
      vp3: add fate test for non-zero last coefficient
      vp3: fix streams with non-zero last coefficient
      swscale: remove unused U/V arguments from yuv2rgb_write().
      timer: K&R formatting cosmetics
      lavf: cosmetics, reformat av_read_frame().
      lavf: refactor av_read_frame() to make it easier to understand.
      Report an error if pitch_lag is zero in AMR-NB decoder.
      Revert "4xm: Prevent buffer overreads."
      4xm: Prevent buffer overreads.
      4xm: pass the correct remaining buffer size to decode_i2_frame().
      ...
    
    Conflicts:
    	libavcodec/4xm.c
    	libavcodec/mjpegdec.c
    	libavcodec/truemotion2.c
    	libavformat/ipmovie.c
    	libavformat/mov_chan.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    3edff185
Name
Last commit
Last update
..
bfin Loading commit data...
mlib Loading commit data...
ppc Loading commit data...
sparc Loading commit data...
x86 Loading commit data...
Makefile Loading commit data...
colorspace-test.c Loading commit data...
libswscale.v Loading commit data...
options.c Loading commit data...
rgb2rgb.c Loading commit data...
rgb2rgb.h Loading commit data...
rgb2rgb_template.c Loading commit data...
swscale-test.c Loading commit data...
swscale.c Loading commit data...
swscale.h Loading commit data...
swscale_internal.h Loading commit data...
swscale_unscaled.c Loading commit data...
utils.c Loading commit data...
yuv2rgb.c Loading commit data...