[FFmpeg-devel] [PATCH] avformat: remove request_probe assert from ff_read_packet

[Andreas Cadhalpun]

On 19.10.2016 22:45, Michael Niedermayer wrote:
> On Wed, Oct 19, 2016 at 07:27:59PM +0200, Andreas Cadhalpun wrote:
>> f1f2b8b10efdab27848eeb2e2bac646eda08a175  0001-avformat-prevent-triggering-request_probe-assert-in-.patch
>> From 7912c6f200a37130844221a73941a7971afa6455 Mon Sep 17 00:00:00 2001
>> From: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
>> Date: Wed, 19 Oct 2016 19:23:49 +0200
>> Subject: [PATCH] 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.
>>
>> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
>> ---
>>  libavformat/utils.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> LGTM

Pushed.

Best regards,
Andreas