diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-08-27 18:17:33 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-11-25 19:05:58 -0500 |
| commit | 3ffed68c2afa6179e77afb61a80bdef6f5f0526e (patch) | |
| tree | dbefbf85b01a0cc2ac364ec49a426b71381d2f94 /libavcodec/mpegaudiodec_float.c | |
| parent | 2d3993ce8c3839ec23d93791c2f085ef0d4633c2 (diff) | |
mpegaudiodec: use planar sample format for output unless packed is requested
Diffstat (limited to 'libavcodec/mpegaudiodec_float.c')
| -rw-r--r-- | libavcodec/mpegaudiodec_float.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libavcodec/mpegaudiodec_float.c b/libavcodec/mpegaudiodec_float.c index 93468f5062..ac8df326be 100644 --- a/libavcodec/mpegaudiodec_float.c +++ b/libavcodec/mpegaudiodec_float.c @@ -33,6 +33,9 @@ AVCodec ff_mp1float_decoder = { .capabilities = CODEC_CAP_DR1, .flush = flush, .long_name = NULL_IF_CONFIG_SMALL("MP1 (MPEG audio layer 1)"), + .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_FLT, + AV_SAMPLE_FMT_NONE }, }; #endif #if CONFIG_MP2FLOAT_DECODER @@ -46,6 +49,9 @@ AVCodec ff_mp2float_decoder = { .capabilities = CODEC_CAP_DR1, .flush = flush, .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), + .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_FLT, + AV_SAMPLE_FMT_NONE }, }; #endif #if CONFIG_MP3FLOAT_DECODER @@ -59,6 +65,9 @@ AVCodec ff_mp3float_decoder = { .capabilities = CODEC_CAP_DR1, .flush = flush, .long_name = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"), + .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_FLT, + AV_SAMPLE_FMT_NONE }, }; #endif #if CONFIG_MP3ADUFLOAT_DECODER @@ -72,6 +81,9 @@ AVCodec ff_mp3adufloat_decoder = { .capabilities = CODEC_CAP_DR1, .flush = flush, .long_name = NULL_IF_CONFIG_SMALL("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"), + .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_FLT, + AV_SAMPLE_FMT_NONE }, }; #endif #if CONFIG_MP3ON4FLOAT_DECODER @@ -86,5 +98,7 @@ AVCodec ff_mp3on4float_decoder = { .capabilities = CODEC_CAP_DR1, .flush = flush_mp3on4, .long_name = NULL_IF_CONFIG_SMALL("MP3onMP4"), + .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_NONE }, }; #endif |