diff mbox series

[FFmpeg-devel] avformat/utils: Find a fallback probe decoder that will also match a forced decoder's codec.

Message ID 20200603111528.200291-1-sfoss@google.com
State Accepted
Headers show
Series [FFmpeg-devel] avformat/utils: Find a fallback probe decoder that will also match a forced decoder's codec.
Related show

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Samuel Foss June 3, 2020, 11:15 a.m. UTC
Prevent codecpar->codec_id from getting out of sync with the codec instantiated for probing.

Signed-off-by: Samuel Foss <sfoss@google.com>
---
 libavformat/utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Niedermayer June 4, 2020, 5:11 p.m. UTC | #1
On Wed, Jun 03, 2020 at 07:15:28AM -0400, Samuel Foss wrote:
> Prevent codecpar->codec_id from getting out of sync with the codec instantiated for probing.
> 
> Signed-off-by: Samuel Foss <sfoss@google.com>
> ---
>  libavformat/utils.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

will apply

thx

[...]
diff mbox series

Patch

diff --git a/libavformat/utils.c b/libavformat/utils.c
index c9385318f6..b3d902c6b5 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -219,7 +219,7 @@  static const AVCodec *find_probe_decoder(AVFormatContext *s, const AVStream *st,
         const AVCodec *probe_codec = NULL;
         void *iter = NULL;
         while ((probe_codec = av_codec_iterate(&iter))) {
-            if (probe_codec->id == codec_id &&
+            if (probe_codec->id == codec->id &&
                     av_codec_is_decoder(probe_codec) &&
                     !(probe_codec->capabilities & (AV_CODEC_CAP_AVOID_PROBING | AV_CODEC_CAP_EXPERIMENTAL))) {
                 return probe_codec;