• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 537a9e5c
    Michael Niedermayer authored
    * qatar/master:
      ppc: fix some pointer to integer casts
      ppc: fix 32-bit PIC build
      vmdaudio: fix decoding of 16-bit audio format.
      lavf: do not set codec_tag for rawvideo
      h264: check for out of bounds reads in ff_h264_decode_extradata().
      flvdec: Check for overflow before allocating arrays
      avconv: use correct output stream index when checking max_frames
      avconv: remove fake coded_frame on streamcopy hack
    
    Conflicts:
    	avconv.c
    	libavcodec/h264.c
    	libavcodec/ppc/asm.S
    	libavcodec/vmdav.c
    	libavformat/flvdec.c
    	libavformat/utils.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    537a9e5c
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...