Handle Default-Stream flags on video streams properly

1 files changed, 6 insertions, 0 deletions

diff --git a/demuxer/Demuxers/LAVFDemuxer.cpp b/demuxer/Demuxers/LAVFDemuxer.cpp
index 0425ea8f..1b209910 100644
--- a/demuxer/Demuxers/LAVFDemuxer.cpp
+++ b/demuxer/Demuxers/LAVFDemuxer.cpp
@@ -1678,6 +1678,12 @@ const CBaseDemuxer::stream *CLAVFDemuxer::SelectVideoStream()
   std::deque<stream>::iterator it;
   for ( it = streams->begin(); it != streams->end(); ++it ) {
     stream *check = &*it;
+
+    if (m_avFormat->streams[check->pid]->disposition & AV_DISPOSITION_DEFAULT) {
+      best = check;
+      break;
+    }
+
     if (!best) { best = check; continue; }
     uint64_t bestPixels = m_avFormat->streams[best->pid]->codec->width * m_avFormat->streams[best->pid]->codec->height;
     uint64_t checkPixels = m_avFormat->streams[check->pid]->codec->width * m_avFormat->streams[check->pid]->codec->height;