# HG changeset patch # User aurel # Date 1178389502 0 # Node ID 13ef168891b07ff9d39c44ab3e53772e9215a4c1 # Parent c22e101130156b8bfafb126fd97996727db18399 add a ff_ prefix to the now exported mpeg1_find_frame_end() function diff -r c22e10113015 -r 13ef168891b0 mpeg12.c --- a/mpeg12.c Sat May 05 18:18:51 2007 +0000 +++ b/mpeg12.c Sat May 05 18:25:02 2007 +0000 @@ -3032,7 +3032,7 @@ * 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 @@ } 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; diff -r c22e10113015 -r 13ef168891b0 mpegvideo.h --- a/mpegvideo.h Sat May 05 18:18:51 2007 +0000 +++ b/mpegvideo.h Sat May 05 18:25:02 2007 +0000 @@ -796,7 +796,7 @@ 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" diff -r c22e10113015 -r 13ef168891b0 mpegvideo_parser.c --- a/mpegvideo_parser.c Sat May 05 18:18:51 2007 +0000 +++ b/mpegvideo_parser.c Sat May 05 18:25:02 2007 +0000 @@ -138,7 +138,7 @@ 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;