summaryrefslogtreecommitdiff
path: root/libavcodec/mpegaudioenc_template.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-09 02:24:42 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-09 02:59:43 +0200
commit352e13e2a9914c623fc53fab3ff49a21e9232674 (patch)
tree15bbc47b55b6b839972832ac7cedcec6edc5c6a6 /libavcodec/mpegaudioenc_template.c
parent6c019f05ed5333037e192e8c84d047321fc3629a (diff)
parent46439e156219d27f059cf687743ba5aacf238b87 (diff)
downloadffmpeg-352e13e2a9914c623fc53fab3ff49a21e9232674.tar.gz
Merge commit '46439e156219d27f059cf687743ba5aacf238b87'
* commit '46439e156219d27f059cf687743ba5aacf238b87': mp2: match twolame default options Not merged as the change breaks fate, also forcing resampling to specific sample rate reduces quality, and would be like rescaling every movie to 1080. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudioenc_template.c')
-rw-r--r--libavcodec/mpegaudioenc_template.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegaudioenc_template.c b/libavcodec/mpegaudioenc_template.c
index b2dfe78254..ae573281e2 100644
--- a/libavcodec/mpegaudioenc_template.c
+++ b/libavcodec/mpegaudioenc_template.c
@@ -773,7 +773,7 @@ static int MPA_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
}
static const AVCodecDefault mp2_defaults[] = {
- { "b", "128k" },
+ { "b", "128k" },
{ NULL },
};