Merge commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f'

* commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f':
  lavf: remove a pointless check

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavformat/utils.c
index f0685ee,031fa3b..fc1ab6d
--- 1/libavformat/utils.c
--- 2/libavformat/utils.c
+++ b/libavformat/utils.c
@@@ -3205,16 -2401,9 +3205,16 @@@ int avformat_find_stream_info(AVFormatC
  
   find_stream_info_err:
      for (i=0; i < ic->nb_streams; i++) {
 -        ic->streams[i]->codec->thread_count = 0;
 +        st = ic->streams[i];
-         if (ic->streams[i]->codec && ic->streams[i]->codec->codec_type != AVMEDIA_TYPE_AUDIO)
++        if (ic->streams[i]->codec->codec_type != AVMEDIA_TYPE_AUDIO)
 +            ic->streams[i]->codec->thread_count = 0;
 +        if (st->info)
 +            av_freep(&st->info->duration_error);
          av_freep(&ic->streams[i]->info);
      }
 +    if(ic->pb)
 +        av_log(ic, AV_LOG_DEBUG, "After avformat_find_stream_info() pos: %"PRId64" bytes read:%"PRId64" seeks:%d frames:%d\n",
 +               avio_tell(ic->pb), ic->pb->bytes_read, ic->pb->seek_count, count);
      return ret;
  }