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:46:30 +0100 |
| commit | e14da0578c85721ac6f59ddcd9fb4c778bfc5d09 (patch) | |
| tree | be4b4c3cc2711cd68a89573b654c2ed7e60fd934 /libavformat/adp.c | |
| parent | afd0f8f7750a7ced0123c939be24985fe918a1e3 (diff) | |
| download | ffmpeg-e14da0578c85721ac6f59ddcd9fb4c778bfc5d09.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 'libavformat/adp.c')
0 files changed, 0 insertions, 0 deletions