mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-24 16:22:37 +00:00
add a ff_ prefix to the now exported mpeg1_find_frame_end() function
Originally committed as revision 8902 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
7f50d4ac51
commit
95dca03f77
@ -3032,7 +3032,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 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(AVCodecContext *avctx,
|
||||
}
|
||||
|
||||
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;
|
||||
|
@ -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"
|
||||
|
||||
|
@ -138,7 +138,7 @@ static int mpegvideo_parse(AVCodecParserContext *s,
|
||||
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;
|
||||
|
Loading…
Reference in New Issue
Block a user