[SCM] libav/experimental: make mpeg4video_split public as ff_mpeg4video_split

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d136d2fceabf58fbbadc07b4a03bd25d193849ff
Author: Stefan Gehrer <stefan.gehrer at gmx.de>
Date:   Sun Nov 12 20:01:50 2006 +0000

    make mpeg4video_split public as ff_mpeg4video_split
    
    Originally committed as revision 6991 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 3ac5f8e..63a1a60 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -387,7 +387,7 @@ static int cavsvideo_parse(AVCodecParserContext *s,
 }
 #endif /* CONFIG_CAVSVIDEO_PARSER */
 
-static int mpeg4video_split(AVCodecContext *avctx,
+int ff_mpeg4video_split(AVCodecContext *avctx,
                            const uint8_t *buf, int buf_size)
 {
     int i;
@@ -854,7 +854,7 @@ AVCodecParser mpeg4video_parser = {
     mpeg4video_parse_init,
     mpeg4video_parse,
     ff_parse1_close,
-    mpeg4video_split,
+    ff_mpeg4video_split,
 };
 #endif
 #ifdef CONFIG_CAVSVIDEO_PARSER
@@ -864,7 +864,7 @@ AVCodecParser cavsvideo_parser = {
     NULL,
     cavsvideo_parse,
     ff_parse1_close,
-    mpeg4video_split,
+    ff_mpeg4video_split,
 };
 #endif
 #ifdef CONFIG_MPEGAUDIO_PARSER
diff --git a/libavcodec/parser.h b/libavcodec/parser.h
index 46e1d8c..6a0398a 100644
--- a/libavcodec/parser.h
+++ b/libavcodec/parser.h
@@ -52,6 +52,8 @@ typedef struct ParseContext1{
 #define END_NOT_FOUND (-100)
 
 int ff_combine_frame(ParseContext *pc, int next, uint8_t **buf, int *buf_size);
+int ff_mpeg4video_split(AVCodecContext *avctx, const uint8_t *buf,
+                        int buf_size);
 void ff_parse_close(AVCodecParserContext *s);
 void ff_parse1_close(AVCodecParserContext *s);
 

-- 
Libav/FFmpeg packaging