Mercurial > libavformat.hg

changeset 5686:a84525174bcf libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Attempt to fix the completely random values returned by ff_avc_find_startcode().
author michael
date Mon, 22 Feb 2010 00:34:27 +0000
parents e8614dbd9b7b
children 7b939c780afc
files avc.c
diffstat 1 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/avc.c	Sun Feb 21 14:41:39 2010 +0000
+++ b/avc.c	Mon Feb 22 00:34:27 2010 +0000
@@ -23,7 +23,7 @@
 #include "avformat.h"
 #include "avio.h"
 
-const uint8_t *ff_avc_find_startcode(const uint8_t *p, const uint8_t *end)
+static const uint8_t *ff_avc_find_startcode_internal(const uint8_t *p, const uint8_t *end)
 {
     const uint8_t *a = p + 4 - ((intptr_t)p & 3);
 
@@ -39,15 +39,15 @@
         if ((x - 0x01010101) & (~x) & 0x80808080) { // generic
             if (p[1] == 0) {
                 if (p[0] == 0 && p[2] == 1)
-                    return p-1;
+                    return p;
                 if (p[2] == 0 && p[3] == 1)
-                    return p;
+                    return p+1;
             }
             if (p[3] == 0) {
                 if (p[2] == 0 && p[4] == 1)
-                    return p+1;
+                    return p+2;
                 if (p[4] == 0 && p[5] == 1)
-                    return p+2;
+                    return p+3;
             }
         }
     }
@@ -60,6 +60,12 @@
     return end + 3;
 }
 
+const uint8_t *ff_avc_find_startcode(const uint8_t *p, const uint8_t *end){
+    const uint8_t *out= ff_avc_find_startcode_internal(p, end);
+    if(p<out && out<end && !out[-1]) out--;
+    return out;
+}
+
 int ff_avc_parse_nal_units(ByteIOContext *pb, const uint8_t *buf_in, int size)
 {
     const uint8_t *p = buf_in;