AvFormatDecoder::autoSelectVideoTrack(): fully select the track

The only functional change is to also set m_currentTrack[kTrackTypeVideo] to fully
select the video track since those variables are not not used before the call
to autoSelectVideoTrack() later in ScanStreams().

m_currentTrack[kTrackTypeVideo] would have been set to the same value later by
AutoSelectTrack().

mythtv/libs/libmythtv/decoders/avformatdecoder.cpp

@@ -1881,6 +1881,11 @@ void AvFormatDecoder::ScanDSMCCStreams(AVBufferRef* pmt_section)
 
 int AvFormatDecoder::autoSelectVideoTrack(int& scanerror)
 {
+    m_tracks[kTrackTypeVideo].clear();
+    m_selectedTrack[kTrackTypeVideo].m_av_stream_index = -1;
+    m_currentTrack[kTrackTypeVideo] = -1;
+    m_fps = 0;
+
     const AVCodec *codec = nullptr;
     LOG(VB_PLAYBACK, LOG_INFO, LOC + "Trying to select best video track");
 
@@ -1912,6 +1917,7 @@ int AvFormatDecoder::autoSelectVideoTrack(int& scanerror)
 
     m_tracks[kTrackTypeVideo].push_back(si);
     m_selectedTrack[kTrackTypeVideo] = si;
+    m_currentTrack[kTrackTypeVideo] = m_tracks[kTrackTypeVideo].size() - 1;
 
     QString codectype(AVMediaTypeToString(codecContext->codec_type));
     if (codecContext->codec_type == AVMEDIA_TYPE_VIDEO)
@@ -2113,13 +2119,7 @@ int AvFormatDecoder::ScanStreams(bool novideo)
     m_tracks[kTrackTypeTeletextCaptions].clear();
     m_tracks[kTrackTypeTeletextMenu].clear();
     m_tracks[kTrackTypeRawText].clear();
-    if (!novideo)
-    {
-        // we will rescan video streams
-        m_tracks[kTrackTypeVideo].clear();
-        m_selectedTrack[kTrackTypeVideo].m_av_stream_index = -1;
-        m_fps = 0;
-    }
+
     std::map<int,uint> lang_sub_cnt;
     uint subtitleStreamCount = 0;
     std::map<int,uint> lang_aud_cnt;