Michael Niedermayer 7a02527b05 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  ac3enc: use correct alignment and length in channel coupling dsp functions.
  ffmpeg: don't abuse a global for passing framerate from input to output
  ffmpeg: don't abuse a global for passing channels from input to output
  ffmpeg: don't abuse a global for passing samplerate from input to output
  ARM: update ff_h264_idct8_add4_neon for 4:4:4 changes
  swscale: use SwsContext for av_log when available
  swscale: Remove HAVE_MMX from files that are only compiled with MMX enabled.
  swscale: Fix compilation with --disable-mmx2.

Conflicts:
	ffmpeg.c
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2011-06-16 03:53:58 +02:00

..

bfin

swscale: fix compilation of bfin due to missing pixdesc.h header

2011-06-01 13:30:35 +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-06-08 05:25:28 +02:00

sparc

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

x86

Merge remote-tracking branch 'qatar/master'

2011-06-16 03:53:58 +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

swscale: split swscale.c in unscaled and generic conversion routines.

2011-06-03 09:52:09 -07:00

options.c

Merge remote-tracking branch 'qatar/master'

2011-05-25 06:32:45 +02:00

rgb2rgb_template.c

Merge remote-tracking branch 'qatar/master'

2011-05-30 01:29:11 +02:00

rgb2rgb.c

Merge remote-tracking branch 'qatar/master' into master

2011-05-29 03:34:35 +02:00

rgb2rgb.h

Merge remote-tracking branch 'qatar/master' into master

2011-05-29 03:34:35 +02:00

swscale_internal.h

swscale: fix JPEG-range YUV scaling artifacts.

2011-06-14 09:46:49 -04:00

swscale_template.c

Merge remote-tracking branch 'qatar/master'

2011-06-04 06:35:17 +02:00

swscale_unscaled.c

Merge remote-tracking branch 'qatar/master'

2011-06-04 06:35:17 +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-06-15 02:15:25 +02:00

swscale.h

swscale: reintroduce sws_format_name() symbol

2011-06-03 00:41:14 +02:00

utils.c

Merge remote-tracking branch 'qatar/master'

2011-06-16 03:53:58 +02:00

yuv2rgb.c

swscale: remove sws_format_name()

2011-05-30 09:07:43 +02:00