ffmpeg/libswscale
Michael Niedermayer c55780dcef Merge remote branch 'qatar/master'
* qatar/master: (32 commits)
  libopencore-amr, libvo-amrwbenc: Allow enabling DTX via private AVOptions
  libopencore-amr, libvo-amrwbenc: Only check the bitrate when changed
  libopencore-amr, libvo-amrwbenc: Find the closest matching bitrate
  libvo-*: Fix up the long codec names
  libavcodec: Mark AVCodec->priv_class const
  swscale: Factorize FAST_BGR2YV12 definition.
  libvo-aacenc: Only produce extradata if the global header flag is set
  lavf: postpone removal of public metadata conversion API
  lavc: postpone removal of request_channels
  lavc: postpone removal of audioconvert and sample_fmt wrappers
  lavf: postpone removal of deprecated avio functions
  libopencore-amr: Cosmetics: Rewrap and align
  libopencore-amr, libvo-amrbwenc: Rename variables and functions
  libopencore-amr: Convert commented out debug logging into av_dlog
  libopencore-amr: Remove an unused state variable
  libvo-amrwbenc: Don't explicitly store bitrate modes in the bitrate table
  libopencore-amr: Remove a useless local variable
  libopencore-amr, libvo-amrwbenc: Make the bitrate/mode mapping array static const
  libopencore-amr, libvo-amrwbenc: Return proper error codes in most places
  libopencore-amr: Don't print carriage returns in log messages
  ...

Conflicts:
	doc/developer.texi
	libavcodec/avcodec.h
	libavcodec/libvo-aacenc.c
	libavcodec/libvo-amrwbenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-14 03:21:38 +02:00
..
bfin Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mlib Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
ppc Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
sparc Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
x86 Add unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX(). 2011-04-11 14:18:48 +02:00
Makefile Merge libavcore into libavutil 2011-02-15 16:18:21 +01:00
colorspace-test.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
libswscale.v Add symbol versioning for shared libraries 2010-01-16 04:48:55 +00:00
options.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
rgb2rgb.c Merge remote branch 'qatar/master' 2011-04-14 03:21:38 +02:00
rgb2rgb.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
rgb2rgb_template.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
swscale-test.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
swscale.c Merge remote branch 'qatar/master' 2011-04-14 03:21:38 +02:00
swscale.h Merge remote branch 'qatar/master' 2011-04-07 03:32:26 +02:00
swscale_internal.h Merge remote branch 'qatar/master' 2011-04-14 03:21:38 +02:00
swscale_template.c Add pixel formats for 9- and 10-bit yuv420p. 2011-04-10 22:33:41 +02:00
utils.c Add pixel formats for 9- and 10-bit yuv420p. 2011-04-10 22:33:41 +02:00
yuv2rgb.c libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation 2011-03-26 13:24:32 +11:00