oggdec: Set dts when known

[ffmpeg] / libavformat / avc.c

diff --git a/libavformat/avc.c b/libavformat/avc.c
index 6ecea38a4752251a1b7332f87c4c308163af2dd9..0731e39698b37f1a9b699423c38b752241a1c760 100644 (file)
--- a/libavformat/avc.c
+++ b/libavformat/avc.c
@@ -25,35 +25,35 @@
 
 const uint8_t *ff_avc_find_startcode(const uint8_t *p, const uint8_t *end)
 {
-    const uint8_t *a = p + 4 - ((long)p & 3);
+    const uint8_t *a = p + 4 - ((intptr_t)p & 3);
 
-    for( end -= 3; p < a && p < end; p++ ) {
-        if( p[0] == 0 && p[1] == 0 && p[2] == 1 )
+    for (end -= 3; p < a && p < end; p++) {
+        if (p[0] == 0 && p[1] == 0 && p[2] == 1)
             return p;
     }
 
-    for( end -= 3; p < end; p += 4 ) {
+    for (end -= 3; p < end; p += 4) {
         uint32_t x = *(const uint32_t*)p;
-//      if( (x - 0x01000100) & (~x) & 0x80008000 ) // little endian
-//      if( (x - 0x00010001) & (~x) & 0x00800080 ) // big endian
-        if( (x - 0x01010101) & (~x) & 0x80808080 ) { // generic
-            if( p[1] == 0 ) {
-                if( p[0] == 0 && p[2] == 1 )
+//      if ((x - 0x01000100) & (~x) & 0x80008000) // little endian
+//      if ((x - 0x00010001) & (~x) & 0x00800080) // big endian
+        if ((x - 0x01010101) & (~x) & 0x80808080) { // generic
+            if (p[1] == 0) {
+                if (p[0] == 0 && p[2] == 1)
                     return p-1;
-                if( p[2] == 0 && p[3] == 1 )
+                if (p[2] == 0 && p[3] == 1)
                     return p;
             }
-            if( p[3] == 0 ) {
-                if( p[2] == 0 && p[4] == 1 )
+            if (p[3] == 0) {
+                if (p[2] == 0 && p[4] == 1)
                     return p+1;
-                if( p[4] == 0 && p[5] == 1 )
+                if (p[4] == 0 && p[5] == 1)
                     return p+2;
             }
         }
     }
 
-    for( end += 3; p < end; p++ ) {
-        if( p[0] == 0 && p[1] == 0 && p[2] == 1 )
+    for (end += 3; p < end; p++) {
+        if (p[0] == 0 && p[1] == 0 && p[2] == 1)
             return p;
     }