RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68' 

* commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68':
  asf: Do not skip data streams

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-06-30 12:24:12 +02:00
parent 0d5a27c2b5 5bdfc17189
commit 3cd6b6aa0f
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/asfdec_o.c
View File

@ -747,12 +747,6 @@ static int asf_read_stream_properties(AVFormatContext *s, const GUIDParseTable *
av_init_packet(&asf_st->pkt.avpkt);
asf_st->pkt.data_size = 0;
avio_skip(pb, 4); // skip reserved field
if (!ts_data_len) {
av_log(s, AV_LOG_WARNING, "Suspicious data found! ASF stream #%d will be ignored.\n",
asf_st->stream_index);
align_position(pb, asf->offset, size);
return 0;
}
switch (type) {
case AVMEDIA_TYPE_AUDIO: