[FFmpeg-cvslog] lavf/utils: Respect default disposition when select the AVStream

[Jun Zhao]

ffmpeg | branch: master | Jun Zhao <barryjzhao at tencent.com> | Thu Jun 20 12:26:27 2019 +0800| [9521d7dd58150b6b3604bf46643129c34647938c] | committer: Jun Zhao

lavf/utils: Respect default disposition when select the AVStream

Respect default disposition when select the AVStream

Signed-off-by: Jun Zhao <barryjzhao at tencent.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9521d7dd58150b6b3604bf46643129c34647938c
---

 libavformat/utils.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 3d764c18d6..886cd6fd83 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -4218,7 +4218,8 @@ int av_find_best_stream(AVFormatContext *ic, enum AVMediaType type,
                 continue;
             }
         }
-        disposition = !(st->disposition & (AV_DISPOSITION_HEARING_IMPAIRED | AV_DISPOSITION_VISUAL_IMPAIRED));
+        disposition = !(st->disposition & (AV_DISPOSITION_HEARING_IMPAIRED | AV_DISPOSITION_VISUAL_IMPAIRED))
+                      + !! (st->disposition & AV_DISPOSITION_DEFAULT);
         count = st->codec_info_nb_frames;
         bitrate = par->bit_rate;
         multiframe = FFMIN(5, count);