diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-26 14:24:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-26 14:24:19 +0100 |
| commit | a13148f63351db5f8283a23de9a22e940d29d8cd (patch) | |
| tree | 7a9a10399626bebfc3f63f6b30087f06ae178e2f /libavcodec/mpegaudiodec_float.c | |
| parent | 86270236d5ef97263858a576fab2c366fb2aa76a (diff) | |
| parent | 8e134e5104e99a69cd4cea10540a7ce9c3682a2c (diff) | |
Merge commit '8e134e5104e99a69cd4cea10540a7ce9c3682a2c'
* commit '8e134e5104e99a69cd4cea10540a7ce9c3682a2c':
lavc: clarify get_buffer() documentation
mpegaudiodec: use planar sample format for output unless packed is requested
x86: h264 qpel: use the correct number of utilized xmm regs in cglobal
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 e26a0a9ad9..17a7757f95 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 |