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

[Andreas Cadhalpun]

On 19.10.2016 05:29, Michael Niedermayer wrote:
> hmm, i guess the patch is then ok
> alternatively you could use i think:
> @@ -803,7 +803,7 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt)
>                  return ret;
>              for (i = 0; i < s->nb_streams; i++) {
>                  st = s->streams[i];
> -                if (st->probe_packets)
> +                if (st->probe_packets || st->request_probe > 0)
>                      if ((err = probe_codec(s, st, NULL)) < 0)
>                          return err;
>                  av_assert0(st->request_probe <= 0);

Yes, this works fine and should guarantee that the assert can't be triggered.
Patch doing it that way is attached.

Best regards,
Andreas

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-avformat-prevent-triggering-request_probe-assert-in-.patch
Type: text/x-diff
Size: 1337 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20161019/aab705e3/attachment.patch>