[FFmpeg-cvslog] avformat/id3v2: Use ffio_ensure_seekback() in id3v2_read_internal()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri May 19 20:54:03 2017 +0200| [0cc6dd1b817bc4510714dd99122625d93909290a] | committer: Michael Niedermayer

avformat/id3v2: Use ffio_ensure_seekback() in id3v2_read_internal()

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/id3v2.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index f7fa3ef856..05346350ad 100644
--- a/libavformat/id3v2.c
+++ b/libavformat/id3v2.c
@@ -1072,7 +1072,9 @@ static void id3v2_read_internal(AVIOContext *pb, AVDictionary **metadata,
             break;
         }
 
-        ret = avio_read(pb, buf, ID3v2_HEADER_SIZE);
+        ret = ffio_ensure_seekback(pb, ID3v2_HEADER_SIZE);
+        if (ret >= 0)
+            ret = avio_read(pb, buf, ID3v2_HEADER_SIZE);
         if (ret != ID3v2_HEADER_SIZE) {
             avio_seek(pb, off, SEEK_SET);
             break;