[FFmpeg-cvslog] asfdec: factor out seeking to the Data Object outside while

[Alexandra Hájková]

ffmpeg | branch: master | Alexandra Hájková <alexandra.khirnova at gmail.com> | Tue Jul 21 09:14:39 2015 +0200| [5655236a67203d923755f285584c6e68abe7e33f] | committer: Anton Khirnov

asfdec: factor out seeking to the Data Object outside while

return INVALIDDARA if Data Object was not found

Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5655236a67203d923755f285584c6e68abe7e33f
---

 libavformat/asfdec.c |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 6613ec6..a625028 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -1652,17 +1652,13 @@ static int asf_read_header(AVFormatContext *s)
      */
     while (1) {
         // for the cases when object size is invalid
-        if (avio_tell(pb) == asf->offset) {
-            if (asf->data_reached)
-                avio_seek(pb, asf->first_packet_offset, SEEK_SET);
+        if (avio_tell(pb) == asf->offset)
             break;
-        }
         asf->offset = avio_tell(pb);
         if ((ret = ff_get_guid(pb, &guid)) < 0) {
-            if (ret == AVERROR_EOF && asf->data_reached) {
-                avio_seek(pb, asf->first_packet_offset, SEEK_SET);
+            if (ret == AVERROR_EOF && asf->data_reached)
                 break;
-            } else
+            else
                 return ret;
         }
         g = find_guid(guid);
@@ -1679,6 +1675,13 @@ static int asf_read_header(AVFormatContext *s)
             break;
     }
 
+    if (!asf->data_reached) {
+        av_log(s, AV_LOG_ERROR, "Data Object was not found.\n");
+        return AVERROR_INVALIDDATA;
+    }
+    if (pb->seekable)
+        avio_seek(pb, asf->first_packet_offset, SEEK_SET);
+
     for (i = 0; i < asf->nb_streams; i++) {
         const char *rfc1766 = asf->asf_sd[asf->asf_st[i]->lang_idx].langs;
         AVStream *st        = s->streams[asf->asf_st[i]->index];