FFmpeg/libswscale
Michael Niedermayer 040ad30bc8 Merge branch 'release/0.7' into oldabi
* release/0.7: (296 commits)
  Update version numbers for 0.7.5
  vp6: partially propagate huffman tree building errors during coeff model parsing and fix misspelling
  Check for huffman tree building error in vp6 decoder.
  Release old pictures after a resolution change in vp5/6 decoder
  Check for missing reference in vp5/6 decoder.
  Check for invalid slices offsets in RV30/40 decoder.
  Check output buffer size in nellymoser decoder.
  Hack around gcc 4.6 breaking asm using call.
  Hack around gcc 4.6 breaking asm using call.
  Fix dxva2 decoding for some H264 samples. (cherry picked from commit bf7dc6b29d)
  Fix dxva2 decoding for some H264 samples.
  mp3demux: pass on error code on packet read.
  Check for invalid slice offsets in real decoder.
  rmdec: Reject invalid deinterleaving parameters
  Use deinterleavers for demangling audio packets in RealMedia.
  rv10: Reject slices that does not have the same type as the first one
  rmdec: use the deinterleaving mode and not the codec when creating audio packets.
  MAINTAINERS: add my GPG fingerprint. (cherry picked from commit 7882dc10f8)
  Support 3IVD in isom, produced by 3ivx DivX Doctor.
  mpegpsdec: fix reading first mpegps packet (cherry picked from commit b2f230e23d)
  ...

Conflicts:
	Changelog
	Doxyfile
	Makefile
	RELEASE
	configure
	doc/general.texi
	ffmpeg.c
	ffplay.c
	libavcodec/dxva2_h264.c
	libavcodec/h264.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264idct_template.c
	libavcodec/kgv1dec.c
	libavcodec/mpegvideo.c
	libavcodec/tableprint.h
	libavcodec/vp3.c
	libavdevice/alsa-audio.h
	libavformat/gxf.c
	libavformat/mpegts.c
	libavformat/segafilm.c
	libavformat/utils.c
	libavutil/dict.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-22 04:34:43 +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 swscale: for >8bit scaling, read in native bit-depth. 2011-07-11 03:51:10 +02:00
sparc Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
x86 Hack around gcc 4.6 breaking asm using call. 2011-09-21 23:50:09 +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 Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +02:00
options.c Merge branch 'master' into oldabi 2011-06-16 06:29:01 +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 branch 'sws_32bit_integration' 2011-07-11 04:01:01 +02:00
swscale.h Merge branch 'release/0.7' into oldabi 2011-09-22 04:34:43 +02:00
swscale_internal.h Merge commit '142e76f105' 2011-07-11 04:23:25 +02:00
swscale_template.c Merge remote-tracking branch 'qatar/master' 2011-06-04 06:35:17 +02:00
swscale_unscaled.c Merge branch 'master' into oldabi 2011-08-05 13:02:20 +02:00
utils.c Merge branch 'master' into oldabi 2011-08-05 13:02:20 +02:00
yuv2rgb.c swscale: remove sws_format_name() 2011-05-30 09:07:43 +02:00