diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 09:57:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 09:57:44 +0200 |
| commit | be72853f8aac459983739ad3a31ffad0ad7997cc (patch) | |
| tree | 702d6b4101018d78cf73d25a22d5600491c8b768 /libavcodec/wavpack.c | |
| parent | f6beb3611534e131b3f95036799b32735f6ab2f2 (diff) | |
| parent | 7b44c9918086c6aeacf7ef9f902af38b97f43170 (diff) | |
| download | ffmpeg-be72853f8aac459983739ad3a31ffad0ad7997cc.tar.gz | |
Merge commit '7b44c9918086c6aeacf7ef9f902af38b97f43170'
* commit '7b44c9918086c6aeacf7ef9f902af38b97f43170':
wavpack: remove the subframes codec cap
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wavpack.c')
| -rw-r--r-- | libavcodec/wavpack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 5be891c88e..4f89be3ae2 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -1301,6 +1301,6 @@ AVCodec ff_wavpack_decoder = { .close = wavpack_decode_end, .decode = wavpack_decode_frame, .flush = wavpack_decode_flush, - .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1, + .capabilities = CODEC_CAP_DR1, .long_name = NULL_IF_CONFIG_SMALL("WavPack"), }; |