diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-30 12:24:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-30 12:48:11 +0200 |
| commit | 3cd6b6aa0f847afeeac7742489f139ce39b4bdcb (patch) | |
| tree | f13fbf33a3a31f9677c3d4782ac0ea8366e180e8 /libavformat/asfdec_o.c | |
| parent | 0d5a27c2b5a1a2981f53aa5c093d1ddcc4ff472b (diff) | |
| parent | 5bdfc17189e4ea63c6b46b6d5256852fcb409d68 (diff) | |
| download | ffmpeg-3cd6b6aa0f847afeeac7742489f139ce39b4bdcb.tar.gz | |
Merge commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68'
* commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68':
asf: Do not skip data streams
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/asfdec_o.c')
| -rw-r--r-- | libavformat/asfdec_o.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index 4e76e85949..17f958fed5 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -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: |