ffmpeg/libswscale
Michael Niedermayer 2b0cdb7364 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Move id3v2 tag writing to a separate file.
  swscale: add missing colons to x86 assembly yuv2planeX.
  g722: split decoder and encoder into separate files
  cosmetics: remove extra spaces before end-of-statement semi-colons
  vorbisdec: check output buffer size before writing output
  wavpack: calculate bpp using av_get_bytes_per_sample()
  ac3enc: Set max value for mode options correctly
  lavc: move get_b_cbp() from h263.h to mpeg4videoenc.c
  mpeg12: move closed_gop from MpegEncContext to Mpeg1Context
  mpeg12: move full_pel from MpegEncContext to Mpeg1Context
  mpeg12: move Mpeg1Context from mpeg12.c to mpeg12.h
  mpegvideo: remove some unused variables from MpegEncContext.

Conflicts:
	libavcodec/mpeg12.c
	libavformat/mp3enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-24 01:01:21 +02:00
..
bfin
mlib
ppc Merge remote-tracking branch 'qatar/master' 2011-10-23 05:13:56 +02:00
sparc
x86 Merge remote-tracking branch 'qatar/master' 2011-10-24 01:01:21 +02:00
Makefile Compile x86/swscale_template with -mno-red-zone. 2011-09-25 16:59:52 +02:00
colorspace-test.c
libswscale.v
options.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
rgb2rgb.c
rgb2rgb.h
rgb2rgb_template.c
swscale-test.c sws-test: Fix data alignment 2011-10-23 23:35:28 +02:00
swscale.c sws: fix assert failure 2011-10-23 20:18:21 +02:00
swscale.h Merge remote-tracking branch 'qatar/master' 2011-09-04 04:11:53 +02:00
swscale_internal.h sws: add yuv2yuvX() back and updated to the just 1 plane API 2011-10-23 19:31:55 +02:00
swscale_unscaled.c sws: fix warning: new qualifiers in middle of multi-level non-const cast are unsafe warning. 2011-10-22 05:21:01 +02:00
utils.c Merge remote-tracking branch 'qatar/master' 2011-10-22 01:16:41 +02:00
yuv2rgb.c Merge remote-tracking branch 'qatar/master' 2011-10-22 01:16:41 +02:00