From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 17 Jan 2007 10:55:01 +0000 (+0000)
Subject: simplify pts/dts reading
X-Git-Tag: v0.5~10498
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b90ba24b9a0975c410409116e00c67410a4091a5;p=platform%2Fupstream%2Flibav.git

simplify pts/dts reading

Originally committed as revision 7565 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 7e6a6e8..cff9fe2 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -1502,13 +1502,13 @@ static int mpegps_read_pes_header(AVFormatContext *s,
         c = get_byte(&s->pb);
         len -= 2;
     }
-    if ((c & 0xf0) == 0x20) {
+    if ((c & 0xe0) == 0x20) {
         dts = pts = get_pts(&s->pb, c);
         len -= 4;
-    } else if ((c & 0xf0) == 0x30) {
-        pts = get_pts(&s->pb, c);
-        dts = get_pts(&s->pb, -1);
-        len -= 9;
+        if (c & 0x10){
+            dts = get_pts(&s->pb, -1);
+            len -= 5;
+        }
     } else if ((c & 0xc0) == 0x80) {
         /* mpeg 2 PES */
 #if 0 /* some streams have this field set for no apparent reason */
@@ -1522,15 +1522,15 @@ static int mpegps_read_pes_header(AVFormatContext *s,
         len -= 2;
         if (header_len > len)
             goto error_redo;
-        if ((flags & 0xc0) == 0x80) {
+        if (flags & 0x80) {
             dts = pts = get_pts(&s->pb, -1);
             header_len -= 5;
             len -= 5;
-        } if ((flags & 0xc0) == 0xc0) {
-            pts = get_pts(&s->pb, -1);
-            dts = get_pts(&s->pb, -1);
-            header_len -= 10;
-            len -= 10;
+            if (flags & 0x40) {
+                dts = get_pts(&s->pb, -1);
+                header_len -= 5;
+                len -= 5;
+            }
         }
         len -= header_len;
         while (header_len > 0) {