Merge commit '0c082565965258dca143767cc6cb25e38b6e9ea3'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Feb 2014 15:16:16 +0000 (16:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Feb 2014 15:16:16 +0000 (16:16 +0100)
* commit '0c082565965258dca143767cc6cb25e38b6e9ea3':
  asfdec: short-circuit seeking to the start of stream

Conflicts:
libavformat/asfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/asfdec.c

index 8d6de4a..4db908d 100644 (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)