diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-22 14:06:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-22 15:00:53 +0200 |
| commit | 124deea1a0ccc4296cc6021231a7e6fbf336ff3a (patch) | |
| tree | 95db44e4e9ed969674f9dbb194a999c8150a1e03 /libavcodec/mpegaudioenc.c | |
| parent | aeba058340ec47a10049c9cefb7ca8d500047b31 (diff) | |
| parent | ae60927aefe7a9debc285451b2badf1b8eb5ab22 (diff) | |
| download | ffmpeg-124deea1a0ccc4296cc6021231a7e6fbf336ff3a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libx264: only use ABR mode when the user explicitly set bitrate.
libx264: use medium preset by default.
mp2 encoder: make 128k the default bitrate.
movenc: use libx264 by default when possible for mov, mp4 and psp
avienc: saner default audio codec.
matroskaenc: saner default codecs.
avplay: add examples of how to specify size/pixel format through private options
lavc: add A|E|D flags to "ac" and "ar" options
Conflicts:
doc/ffplay.texi
libavcodec/libx264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudioenc.c')
| -rw-r--r-- | libavcodec/mpegaudioenc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/mpegaudioenc.c b/libavcodec/mpegaudioenc.c index 0ca99bac15..cc4dee9636 100644 --- a/libavcodec/mpegaudioenc.c +++ b/libavcodec/mpegaudioenc.c @@ -25,6 +25,7 @@ */ #include "avcodec.h" +#include "internal.h" #include "put_bits.h" #define FRAC_BITS 15 /* fractional bits for sb_samples and dct */ @@ -763,6 +764,11 @@ static av_cold int MPA_encode_close(AVCodecContext *avctx) return 0; } +static const AVCodecDefault mp2_defaults[] = { + { "b", "128k" }, + { NULL }, +}; + AVCodec ff_mp2_encoder = { .name = "mp2", .type = AVMEDIA_TYPE_AUDIO, @@ -774,4 +780,5 @@ AVCodec ff_mp2_encoder = { .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, .supported_samplerates= (const int[]){44100, 48000, 32000, 22050, 24000, 16000, 0}, .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), + .defaults = mp2_defaults, }; |