[FFmpeg-cvslog] r8902 - in trunk/libavcodec: mpeg12.c mpegvideo.h mpegvideo_parser.c

aurel subversion
Sat May 5 20:25:02 CEST 2007


Author: aurel
Date: Sat May  5 20:25:02 2007
New Revision: 8902

Log:
add a ff_ prefix to the now exported mpeg1_find_frame_end() function

Modified:
   trunk/libavcodec/mpeg12.c
   trunk/libavcodec/mpegvideo.h
   trunk/libavcodec/mpegvideo_parser.c

Modified: trunk/libavcodec/mpeg12.c
==============================================================================
--- trunk/libavcodec/mpeg12.c	(original)
+++ trunk/libavcodec/mpeg12.c	Sat May  5 20:25:02 2007
@@ -3032,7 +3032,7 @@ static void mpeg_decode_gop(AVCodecConte
  * finds the end of the current frame in the bitstream.
  * @return the position of the first byte of the next frame, or -1
  */
-int mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size)
+int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size)
 {
     int i;
     uint32_t state= pc->state;
@@ -3094,7 +3094,7 @@ static int mpeg_decode_frame(AVCodecCont
     }
 
     if(s2->flags&CODEC_FLAG_TRUNCATED){
-        int next= mpeg1_find_frame_end(&s2->parse_context, buf, buf_size);
+        int next= ff_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;

Modified: trunk/libavcodec/mpegvideo.h
==============================================================================
--- trunk/libavcodec/mpegvideo.h	(original)
+++ trunk/libavcodec/mpegvideo.h	Sat May  5 20:25:02 2007
@@ -796,7 +796,7 @@ void mpeg1_encode_mb(MpegEncContext *s,
 void ff_mpeg1_encode_init(MpegEncContext *s);
 void ff_mpeg1_encode_slice_header(MpegEncContext *s);
 void ff_mpeg1_clean_buffers(MpegEncContext *s);
-int mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size);
+int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size);
 
 #include "rl.h"
 

Modified: trunk/libavcodec/mpegvideo_parser.c
==============================================================================
--- trunk/libavcodec/mpegvideo_parser.c	(original)
+++ trunk/libavcodec/mpegvideo_parser.c	Sat May  5 20:25:02 2007
@@ -138,7 +138,7 @@ static int mpegvideo_parse(AVCodecParser
     if(s->flags & PARSER_FLAG_COMPLETE_FRAMES){
         next= buf_size;
     }else{
-        next= mpeg1_find_frame_end(pc, buf, buf_size);
+        next= ff_mpeg1_find_frame_end(pc, buf, buf_size);
 
         if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) {
             *poutbuf = NULL;




More information about the ffmpeg-cvslog mailing list