RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-17 13:04:50 +00:00
Code Issues Projects Releases Wiki Activity
0047ac1427
ffmpeg/libswscale/ppc
History
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
..
swscale_altivec.c Merge remote-tracking branch 'qatar/master' 2011-09-25 23:30:25 +02:00
yuv2rgb_altivec.c Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +02:00
yuv2rgb_altivec.h Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +02:00
yuv2yuv_altivec.c Merge remote-tracking branch 'qatar/master' 2011-06-04 06:35:17 +02:00