ffmpeg/libswscale
Michael Niedermayer 537a9e5cc2 Merge remote-tracking branch 'qatar/master'
* 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: Michael Niedermayer <michaelni@gmx.at>
2011-09-25 23:30:25 +02:00
..
bfin
mlib
ppc Merge remote-tracking branch 'qatar/master' 2011-09-25 23:30:25 +02:00
sparc
x86
Makefile
colorspace-test.c
libswscale.v
options.c
rgb2rgb.c
rgb2rgb.h
rgb2rgb_template.c
swscale-test.c
swscale.c
swscale.h
swscale_internal.h
swscale_unscaled.c
utils.c
yuv2rgb.c