diff options
| author | James Cowgill <jcowgill@debian.org> | 2017-11-09 12:21:23 +0000 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2017-12-09 21:40:47 +0100 |
| commit | d8d1689f929ca05a86300bc6e5d703961a567ae9 (patch) | |
| tree | 8c1cc3a6b4c17ca6531b63471ecd4c0d0ab3bb72 | |
| parent | c741095eecee385905ec30e9698350d5dfb0b953 (diff) | |
| download | ffmpeg-d8d1689f929ca05a86300bc6e5d703961a567ae9.tar.gz | |
avcodec/decode: reset codec on receiving packet after EOF in compat_decode
In commit 061a0c14bb57 ("decode: restructure the core decoding code"), the
deprecated avcodec_decode_* APIs were reworked so that they called into the
new avcodec_send_packet / avcodec_receive_frame API. This had the side effect
of prohibiting sending new packets containing data after a drain
packet, but in previous versions of FFmpeg this "worked" and some
applications relied on it.
To restore some compatibility, reset the codec if we receive a new non-drain
packet using the old API after draining has completed. While this does
not give the same behaviour as the old API did, in the majority of cases
it works and it does not require changes to any other part of the decoding
code.
Fixes ticket #6775
Signed-off-by: James Cowgill <jcowgill@debian.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
(cherry picked from commit 02ba4b91b5616ecbebee5c9565e1be7af2a6b980)
| -rw-r--r-- | Changelog | 1 | ||||
| -rw-r--r-- | libavcodec/decode.c | 5 |
2 files changed, 6 insertions, 0 deletions
@@ -2,6 +2,7 @@ Entries are sorted chronologically from oldest to youngest within each release, releases are sorted from youngest to oldest. version 3.4.1: +- avcodec/decode: reset codec on receiving packet after EOF in compat_decode - avcodec/diracdsp: Fix integer overflow in PUT_SIGNED_RECT_CLAMPED() - avcodec/dirac_dwt: Fix integer overflows in COMPOSE_DAUB97* - avcodec/extract_extradata_bsf: Fix leak discovered via fuzzing diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 1337ffb527..fb1824be1c 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -753,6 +753,11 @@ static int compat_decode(AVCodecContext *avctx, AVFrame *frame, av_assert0(avci->compat_decode_consumed == 0); + if (avci->draining_done && pkt && pkt->size != 0) { + av_log(avctx, AV_LOG_WARNING, "Got unexpected packet after EOF\n"); + avcodec_flush_buffers(avctx); + } + *got_frame = 0; avci->compat_decode = 1; |