[FFmpeg-devel] [PATCH] avformat/utils: fix logic failure

[Michael Niedermayer]

On Tue, Oct 29, 2019 at 10:45:20AM +0100, Paul B Mahol wrote:
> Fixes decoding of wav file which is wrongly recognized as mp1 audio.
> 
> Signed-off-by: Paul B Mahol <onemda at gmail.com>
> ---
>  libavformat/utils.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavformat/utils.c b/libavformat/utils.c
> index cfb6d03397..bf27531ed0 100644
> --- a/libavformat/utils.c
> +++ b/libavformat/utils.c
> @@ -370,7 +370,7 @@ static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st,
>                  if (fmt_id_type[i].type != AVMEDIA_TYPE_AUDIO &&
>                      st->codecpar->sample_rate)
>                      continue;
> -                if (st->request_probe > score &&
> +                if (st->request_probe > score ||
>                      st->codecpar->codec_id != fmt_id_type[i].id)
>                      continue;

this change is wrong and would break fate,
the 2nd term could be removed if it causes problems but they cannot
be run as "||"

how can this issue be reproduced ?

thx

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Freedom in capitalist society always remains about the same as it was in
ancient Greek republics: Freedom for slave owners. -- Vladimir Lenin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20191029/8c5f7fb4/attachment.sig>