ffmpeg/libswscale
Michael Niedermayer e2cc39b609 Merge remote-tracking branch 'qatar/master'
* qatar/master: (40 commits)
  swf: check return values for av_get/new_packet().
  wavpack: Don't shift minclip/maxclip
  rtpenc: Expose the max packet size via an avoption
  rtpenc: Move max_packet_size to a context variable
  rtpenc: Add an option for not sending RTCP packets
  lavc: drop encode() support for video.
  snowenc: switch to encode2().
  snowenc: don't abuse input picture for storing information.
  a64multienc: switch to encode2().
  a64multienc: don't write into output buffer when there's no output.
  libxvid: switch to encode2().
  tiffenc: switch to encode2().
  tiffenc: properly forward error codes in encode_frame().
  lavc: drop libdirac encoder.
  gifenc: switch to encode2().
  libvpxenc: switch to encode2().
  flashsvenc: switch to encode2().
  Remove libpostproc.
  lcl: don't overwrite input memory.
  swscale: take first/lastline over/underflows into account for MMX.
  ...

Conflicts:
	.gitignore
	Makefile
	cmdutils.c
	configure
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/libdiracenc.c
	libavcodec/libxvidff.c
	libavcodec/qtrleenc.c
	libavcodec/tiffenc.c
	libavcodec/utils.c
	libavformat/mov.c
	libavformat/movenc.c
	libpostproc/Makefile
	libpostproc/postprocess.c
	libpostproc/postprocess.h
	libpostproc/postprocess_altivec_template.c
	libpostproc/postprocess_internal.h
	libpostproc/postprocess_template.c
	libswscale/swscale.c
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-24 02:57:18 +01:00
..
bfin Merge remote-tracking branch 'qatar/master' 2012-02-03 03:51:32 +01:00
ppc Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
sparc Merge remote-tracking branch 'qatar/master' 2012-02-08 05:53:35 +01:00
x86 Merge remote-tracking branch 'qatar/master' 2012-02-24 02:57:18 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-02-09 01:27:12 +01:00
colorspace-test.c swscale-test: Drop unused argc and argv arguments from main(). 2012-02-01 14:24:25 +01:00
input.c Merge remote-tracking branch 'qatar/master' 2012-02-08 05:53:35 +01:00
libswscale.v
options.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00
output.c Merge remote-tracking branch 'qatar/master' 2012-02-18 02:20:19 +01:00
rgb2rgb.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00
rgb2rgb.h
rgb2rgb_template.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00
swscale-test.c
swscale.c Merge remote-tracking branch 'qatar/master' 2012-02-24 02:57:18 +01:00
swscale.h
swscale_internal.h Merge remote-tracking branch 'qatar/master' 2012-02-21 05:10:12 +01:00
swscale_unscaled.c Merge remote-tracking branch 'qatar/master' 2012-02-08 05:53:35 +01:00
utils.c Merge remote-tracking branch 'qatar/master' 2012-02-24 02:57:18 +01:00
yuv2rgb.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00