@@ -191,3 +191,20 @@ int ff_avc_write_annexb_extradata(const uint8_t *in, uint8_t **buf, int *size)

     *size = out_size;

     return 0;

 }

+

+const uint8_t *ff_avc_mp4_find_startcode(const uint8_t *start,

+                                         const uint8_t *end,

+                                         int nal_length_size)

+{

+    unsigned int res = 0;

+

+    if (end - start < nal_length_size)

+        return NULL;

+    while (nal_length_size--)

+        res = (res << 8) | *start++;

+

+    if (res > end - start)

+        return NULL;

+

+    return start + res;

+}

@@ -30,5 +30,8 @@ int ff_avc_parse_nal_units_buf(const uint8_t *buf_in, uint8_t **buf, int *size);

 int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len);

 const uint8_t *ff_avc_find_startcode(const uint8_t *p, const uint8_t *end);

 int ff_avc_write_annexb_extradata(const uint8_t *in, uint8_t **buf, int *size);

+const uint8_t *ff_avc_mp4_find_startcode(const uint8_t *start,

+                                         const uint8_t *end,

+                                         int nal_length_size);

 #endif /* AVFORMAT_AVC_H */

@@ -29,21 +29,6 @@

 #include "avc.h"

 #include "rtpenc.h"

-static const uint8_t *avc_mp4_find_startcode(const uint8_t *start, const uint8_t *end, int nal_length_size)

-{

-    unsigned int res = 0;

-

-    if (end - start < nal_length_size)

-        return NULL;

-    while (nal_length_size--)

-        res = (res << 8) | *start++;

-

-    if (res > end - start)

-        return NULL;

-

-    return start + res;

-}

-

 static void nal_send(AVFormatContext *s1, const uint8_t *buf, int size, int last)

 {

     RTPMuxContext *s = s1->priv_data;

@@ -88,14 +73,14 @@ void ff_rtp_send_h264(AVFormatContext *s1, const uint8_t *buf1, int size)

     s->timestamp = s->cur_timestamp;

     if (s->nal_length_size)

-        r = avc_mp4_find_startcode(buf1, end, s->nal_length_size) ? buf1 : end;

+        r = ff_avc_mp4_find_startcode(buf1, end, s->nal_length_size) ? buf1 : end;

     else

         r = ff_avc_find_startcode(buf1, end);

     while (r < end) {

         const uint8_t *r1;

         if (s->nal_length_size) {

-            r1 = avc_mp4_find_startcode(r, end, s->nal_length_size);

+            r1 = ff_avc_mp4_find_startcode(r, end, s->nal_length_size);

             if (!r1)

                 r1 = end;

             r += s->nal_length_size;