Merge commit 'd1b3fabe6945e511bb20fc9ca52b47eb952526ee'

[ffmpeg] / libavformat / utils.c

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 3f4446deafacf6d97e887de02b114c2c17fdd1c5..c53051155d3c891fc981c6414f9f3fd113ec71c5 100644 (file)
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3263,6 +3263,8 @@ int av_find_best_stream(AVFormatContext *ic,
             continue;
         if (st->disposition & (AV_DISPOSITION_HEARING_IMPAIRED|AV_DISPOSITION_VISUAL_IMPAIRED))
             continue;
+        if (type == AVMEDIA_TYPE_AUDIO && !avctx->channels)
+            continue;
         if (decoder_ret) {
             decoder = find_decoder(ic, st, st->codec->codec_id);
             if (!decoder) {