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
..
acodec	matroskaenc: don't write an empty Cues element.	2011-04-07 18:11:24 +02:00
fate	Merge remote branch 'qatar/master'	2011-04-14 03:21:38 +02:00
lavf	Merge remote branch 'qatar/master'	2011-04-14 03:21:38 +02:00
lavfi	Fix yuvj420p scaling artefact, issue1108.	2011-04-03 16:40:11 +02:00
seek	lavf/utils.c: Order packets with identical PTS by stream index.	2011-04-12 19:06:26 -04:00
vsynth1	In ipod/mov/mp4 muxer, always write esds descriptor length using 4 bytes,	2011-03-30 14:09:09 -07:00
vsynth2	In ipod/mov/mp4 muxer, always write esds descriptor length using 4 bytes,	2011-03-30 14:09:09 -07:00