[SCM] libav/experimental: mp2: Do not force a samplerate

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit a7448064c526f097a47355e2ddb7722a06eeb5e3
Author: Luca Barbato <lu_zero at gentoo.org>
Date:   Fri Apr 11 00:09:34 2014 +0200

    mp2: Do not force a samplerate
    
    The default should be not to resample.

diff --git a/libavcodec/libtwolame.c b/libavcodec/libtwolame.c
index d8d73b3..def5fee 100644
--- 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 },
 };
 
diff --git a/libavcodec/mpegaudioenc.c b/libavcodec/mpegaudioenc.c
index 3a5cdca..51a6f5b 100644
--- a/libavcodec/mpegaudioenc.c
+++ b/libavcodec/mpegaudioenc.c
@@ -744,7 +744,6 @@ static int MPA_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
 
 static const AVCodecDefault mp2_defaults[] = {
     { "b", "384000" },
-    { "ar", "48000" },
     { NULL },
 };
 

-- 
Libav/FFmpeg packaging