[FFmpeg-cvslog] Revert "flvdec: Check the avio_seek return value after reading a metadata packet"

Steven Liu git at videolan.org
Fri Oct 27 03:30:14 EEST 2017


ffmpeg | branch: master | Steven Liu <lq at chinaffmpeg.org> | Fri Oct 27 08:26:11 2017 +0800| [171adca696ee1f507d698940a35ccf7a85c5d072] | committer: Steven Liu

Revert "flvdec: Check the avio_seek return value after reading a  metadata packet"

This reverts commit ef7fe81b8554a2865d47a55edf47420878fa3d91.

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

 libavformat/flvdec.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 2d89bef15f..2e70352c53 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -1015,13 +1015,7 @@ retry:
                    "Skipping flv packet: type %d, size %d, flags %d.\n",
                    type, size, flags);
 skip:
-            if (avio_seek(s->pb, next, SEEK_SET) != next) {
-                 // This can happen if flv_read_metabody above read past
-                 // next, on a non-seekable input, and the preceding data has
-                 // been flushed out from the IO buffer.
-                 av_log(s, AV_LOG_ERROR, "Unable to seek to the next packet\n");
-                 return AVERROR_INVALIDDATA;
-            }
+            avio_seek(s->pb, next, SEEK_SET);
             ret = FFERROR_REDO;
             goto leave;
         }



More information about the ffmpeg-cvslog mailing list