diff options
author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-10-19 19:23:49 +0200 |
---|---|---|
committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-11-27 00:38:51 +0100 |
commit | 0009cf348aa85957dbbe262926e432896a628ff3 (patch) | |
tree | d4c8ef2131b818d238c3cfea4c318eae49d18ad9 /libavcodec/texturedsp.h | |
parent | 492bbe58902ddf7f9085f13345fd01098c44c6de (diff) | |
download | ffmpeg-0009cf348aa85957dbbe262926e432896a628ff3.tar.gz |
avformat: prevent triggering request_probe assert in ff_read_packet
If probe_codec is called with pkt == NULL, it sets probe_packets to 0
and request_probe to -1.
However, request_probe can change when calling s->iformat->read_packet
and thus a probe_packets value of 0 doesn't guarantee a request_probe
value of -1.
In that case calling probe_codec again is necessary to prevent
triggering the assert.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit a5b4476a602f31e451b11ca0c18bc92be130a50e)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Diffstat (limited to 'libavcodec/texturedsp.h')
0 files changed, 0 insertions, 0 deletions