[FFmpeg-cvslog] Seek back to old position after reading id3v1 tag.

Carl Eugen Hoyos git
Mon Mar 7 23:32:52 CET 2011


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Mon Mar  7 10:24:37 2011 +0100| [f8fab7499666e4d157919b7190d916db9f94a665] | committer: Carl Eugen Hoyos

Seek back to old position after reading id3v1 tag.

FFmpeg did not seek back to the original position, but to "0", making
reading a VBR tag impossible.
(issue 2645)

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

 libavformat/id3v1.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavformat/id3v1.c b/libavformat/id3v1.c
index e17e785..9bd10ca 100644
--- a/libavformat/id3v1.c
+++ b/libavformat/id3v1.c
@@ -227,6 +227,7 @@ void ff_id3v1_read(AVFormatContext *s)
 {
     int ret, filesize;
     uint8_t buf[ID3v1_TAG_SIZE];
+    int64_t position = url_ftell(s->pb);
 
     if (!url_is_streamed(s->pb)) {
         /* XXX: change that */
@@ -237,7 +238,7 @@ void ff_id3v1_read(AVFormatContext *s)
             if (ret == ID3v1_TAG_SIZE) {
                 parse_tag(s, buf);
             }
-            avio_seek(s->pb, 0, SEEK_SET);
+            avio_seek(s->pb, position, SEEK_SET);
         }
     }
 }




More information about the ffmpeg-cvslog mailing list