[FFmpeg-cvslog] avformat/mpeg: fix logic failure

Paul B Mahol git at videolan.org
Sun Apr 1 22:00:37 EEST 2018


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sun Apr  1 20:58:48 2018 +0200| [1f7705e5b16d83d2ac4bfc48c7b8d6a34bfef20a] | committer: Paul B Mahol

avformat/mpeg: fix logic failure

Signed-off-by: Paul B Mahol <onemda at gmail.com>

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

 libavformat/mpeg.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index e3dd404677..0c507e9f01 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -450,13 +450,14 @@ redo:
             return ret;
 
         startcode = avio_r8(s->pb);
-        if (startcode == 0x0b && avio_r8(s->pb) == 0x77) {
-            startcode = 0x80;
-            m->raw_ac3 = 1;
-            avio_skip(s->pb, -2);
+        m->raw_ac3 = 0;
+        if (startcode == 0x0b) {
+            if (avio_r8(s->pb) == 0x77) {
+                startcode = 0x80;
+                m->raw_ac3 = 1;
+                avio_skip(s->pb, -2);
+            }
         } else {
-            m->raw_ac3 = 0;
-            avio_skip(s->pb, -1);
             len--;
         }
     }



More information about the ffmpeg-cvslog mailing list