Merge remote-tracking branch 'qatar/master'

* qatar/master: mp2: Do not force a samplerate Conflicts: libavcodec/mpegaudioenc_template.c Only libtwolame changes, as the forcing of a sample rate was not merged for the native mp2 encoder Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 1de8a4f736
parent 268b1eae22 a7448064c5
commit 1de8a4f736
1 changed files with 0 additions and 1 deletions
--- a/libavcodec/libtwolame.c
+++ b/libavcodec/libtwolame.c
@ -191,7 +191,6 @@ static const AVClass twolame_class = {

 static const AVCodecDefault twolame_defaults[] = {
    { "b", "384000" },
-    { "ar", "48000" },
    { NULL },
 };