[SCM] libav/experimental: rename ff_mpeg1_find_frame_end to mpeg1_find_frame_end and make it static

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:53:01 UTC 2013


The following commit has been merged in the experimental branch:
commit 7d6b1abe1ad956ec94a60f1872a0f29375fd0382
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Mon Nov 6 10:46:54 2006 +0000

    rename ff_mpeg1_find_frame_end to mpeg1_find_frame_end and make it static
    
    Originally committed as revision 6915 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index bd532a4..ea4108f 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -2994,7 +2994,7 @@ static void mpeg_decode_gop(AVCodecContext *avctx,
  * finds the end of the current frame in the bitstream.
  * @return the position of the first byte of the next frame, or -1
  */
-int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size)
+static int mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size)
 {
     int i;
     uint32_t state= pc->state;
@@ -3056,7 +3056,7 @@ static int mpeg_decode_frame(AVCodecContext *avctx,
     }
 
     if(s2->flags&CODEC_FLAG_TRUNCATED){
-        int next= ff_mpeg1_find_frame_end(&s2->parse_context, buf, buf_size);
+        int next= mpeg1_find_frame_end(&s2->parse_context, buf, buf_size);
 
         if( ff_combine_frame(&s2->parse_context, next, &buf, &buf_size) < 0 )
             return buf_size;
@@ -3428,7 +3428,7 @@ static int mpegvideo_parse(AVCodecParserContext *s,
     if(s->flags & PARSER_FLAG_COMPLETE_FRAMES){
         next= buf_size;
     }else{
-        next= ff_mpeg1_find_frame_end(pc, buf, buf_size);
+        next= mpeg1_find_frame_end(pc, buf, buf_size);
 
         if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) {
             *poutbuf = NULL;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list