httpauth: Fix the length passed to av_strlcat

[ffmpeg] / libavformat / avc.c

diff --git a/libavformat/avc.c b/libavformat/avc.c
index cd15ca7ce7115c3a9a64a04c58764142f2db1995..7c991961c9ebe8f8fdd49db41452f36404d7ff32 100644 (file)
--- a/libavformat/avc.c
+++ b/libavformat/avc.c
@@ -22,44 +22,51 @@
 #include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "avio.h"
+#include "avc.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 - ((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 )
-                    return p-1;
-                if( p[2] == 0 && p[3] == 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;
-            }
-            if( p[3] == 0 ) {
-                if( p[2] == 0 && p[4] == 1 )
+                if (p[2] == 0 && p[3] == 1)
                     return p+1;
-                if( p[4] == 0 && p[5] == 1 )
+            }
+            if (p[3] == 0) {
+                if (p[2] == 0 && p[4] == 1)
                     return p+2;
+                if (p[4] == 0 && p[5] == 1)
+                    return p+3;
             }
         }
     }
 
-    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;
     }
 
     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;
@@ -97,7 +104,8 @@ int ff_isom_write_avcc(ByteIOContext *pb, const uint8_t *data, int len)
 {
     if (len > 6) {
         /* check for h264 start code */
-        if (AV_RB32(data) == 0x00000001) {
+        if (AV_RB32(data) == 0x00000001 ||
+            AV_RB24(data) == 0x000001) {
             uint8_t *buf=NULL, *end, *start;
             uint32_t sps_size=0, pps_size=0;
             uint8_t *sps=0, *pps=0;