Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-02-14 03:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity
ffmpeg/libswscale
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
..
bfin Merge remote-tracking branch 'qatar/master' 2011-06-22 05:16:40 +02:00
mlib Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
ppc Merge remote-tracking branch 'qatar/master' 2011-09-25 23:30:25 +02:00
sparc Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
x86 Compile x86/swscale_template with -mno-red-zone. 2011-09-25 16:59:52 +02:00
colorspace-test.c Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
libswscale.v Add symbol versioning for shared libraries 2010-01-16 04:48:55 +00:00
Makefile Compile x86/swscale_template with -mno-red-zone. 2011-09-25 16:59:52 +02:00
options.c Merge remote-tracking branch 'qatar/master' 2011-09-04 04:11:53 +02:00
rgb2rgb.c lsws: remove deprecated and unused stuff after the 0->1 major bump 2011-08-04 00:23:00 +02:00
rgb2rgb.h lsws: remove deprecated and unused stuff after the 0->1 major bump 2011-08-04 00:23:00 +02:00
rgb2rgb_template.c Merge remote-tracking branch 'qatar/master' 2011-05-30 01:29:11 +02:00
swscale-test.c swscale: Remove commented-out printf cruft. 2011-05-28 11:09:30 +02:00
swscale.c Merge remote-tracking branch 'qatar/master' 2011-09-24 01:03:07 +02:00
swscale.h Merge remote-tracking branch 'qatar/master' 2011-09-04 04:11:53 +02:00
swscale_internal.h Add new pix_fmt RGBA64 2011-09-24 06:01:45 +02:00
swscale_unscaled.c sws: use shift for chroma sample up convertion 2011-08-25 14:49:29 +02:00
utils.c Add new pix_fmt RGBA64 2011-09-24 06:01:45 +02:00
yuv2rgb.c swscale: remove sws_format_name() 2011-05-30 09:07:43 +02:00