diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 15:34:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 15:34:45 +0100 |
| commit | 76c63bc5d8567817c229adc6a6fcd9cbd902f0d8 (patch) | |
| tree | 7c7bf24456e1450163b97d8ce94cf7fd95073cce | |
| parent | 59725592a97fc65a917001bc248567666dfded5a (diff) | |
| parent | 3867f3718ba82ff11d3e24c6d84beb520d0b174f (diff) | |
| download | ffmpeg-76c63bc5d8567817c229adc6a6fcd9cbd902f0d8.tar.gz | |
Merge commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f'
* commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f':
lavf: remove a pointless check
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index f0685eef60..fc1ab6d146 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3206,7 +3206,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) find_stream_info_err: for (i=0; i < ic->nb_streams; i++) { 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); |