videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Merge commit '0c082565965258dca143767cc6cb25e38b6e9ea3' 

* commit '0c082565965258dca143767cc6cb25e38b6e9ea3':
  asfdec: short-circuit seeking to the start of stream

Conflicts:
	libavformat/asfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-12 16:16:16 +01:00
parent 5634c9518f 0c08256596
commit f73901f815
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/asfdec.c
View File

@ -1538,6 +1538,13 @@ static int asf_read_seek(AVFormatContext *s, int stream_index,
return ret;
}
/* explicitly handle the case of seeking to 0 */
if (!pts) {
asf_reset_header(s);
avio_seek(s->pb, s->data_offset, SEEK_SET);
return 0;
}
if (!asf->index_read) {
ret = asf_build_simple_index(s, stream_index);
if (ret < 0)