diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-29 02:01:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-29 02:54:46 +0100 |
| commit | 5b864470808a352ff7ccfbe44eae3eeae2cccd6e (patch) | |
| tree | dad323850dd8c035d738d5bf22d7ffcdcd02c608 /libavcodec | |
| parent | f3c0e0bf6f53df0977f3878d4f5cec99dff8de9e (diff) | |
| parent | 238ed47faeadf4ed0008da774cf61d6b224e4254 (diff) | |
| download | ffmpeg-5b864470808a352ff7ccfbe44eae3eeae2cccd6e.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Mention in the documentation that fieldmatch needs cfr input.
Use v4l2 input format automatically if filename starts with "/dev/video"
Print a warning if a subtitle demuxer changes utf16 to utf8.
Do not set the lame quality if the user didn't request it.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libmp3lame.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c index 661d1c05e4..d8a444dc98 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -106,9 +106,7 @@ static av_cold int mp3lame_encode_init(AVCodecContext *avctx) lame_set_out_samplerate(s->gfp, avctx->sample_rate); /* algorithmic quality */ - if (avctx->compression_level == FF_COMPRESSION_DEFAULT) - lame_set_quality(s->gfp, 5); - else + if (avctx->compression_level != FF_COMPRESSION_DEFAULT) lame_set_quality(s->gfp, avctx->compression_level); /* rate control */ |