1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
FFmpeg/libswscale/x86
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
..
rgb2rgb_template.c Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
rgb2rgb.c Merge remote-tracking branch 'qatar/master' 2011-06-16 03:53:58 +02:00
scale.asm Merge remote-tracking branch 'qatar/master' 2011-10-24 01:01:21 +02:00
swscale_mmx.c sws: add yuv2yuvX_sse3() 2011-10-23 23:36:06 +02:00
swscale_template.c sws: x86_32 fix 2011-10-23 20:15:37 +02:00
yuv2rgb_mmx.c Merge remote-tracking branch 'qatar/master' 2011-06-16 03:53:58 +02:00
yuv2rgb_template.c In libswscale, use all lines when converting from 422p to rgb with mmx, improve quality. 2011-06-03 03:46:13 +02:00