X-Git-Url: https://git.piment-noir.org/?p=deb_ffmpeg.git;a=blobdiff_plain;f=ffmpeg%2Flibavformat%2Frtpenc_h264.c;h=d2b2ed81b79160b405e77c9e07b26322de628ab2;hp=b6c16e17d8aa5b42396060a0b8749e117804f890;hb=f6fa7814ccfe3e76514b36cf04f5cd3cb657c8cf;hpb=2ba45a602cbfa7b771effba9b11bb4245c21bc00

diff --git a/ffmpeg/libavformat/rtpenc_h264.c b/ffmpeg/libavformat/rtpenc_h264.c
index b6c16e1..d2b2ed8 100644
--- a/ffmpeg/libavformat/rtpenc_h264.c
+++ b/ffmpeg/libavformat/rtpenc_h264.c
@@ -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;