virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

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

Browse Source 
Originally committed as revision 8902 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2007-05-05 18:25:02 +00:00
parent 7f50d4ac51
commit 95dca03f77
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mpeg12.c
View File

@ -3032,7 +3032,7 @@ static void mpeg_decode_gop(AVCodecContext *avctx,
* finds the end of the current frame in the bitstream. * finds the end of the current frame in the bitstream.
* @return the position of the first byte of the next frame, or -1 * @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; int i;
uint32_t state= pc->state; uint32_t state= pc->state;
@ -3094,7 +3094,7 @@ static int mpeg_decode_frame(AVCodecContext *avctx,
} }
if(s2->flags&CODEC_FLAG_TRUNCATED){ 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 ) if( ff_combine_frame(&s2->parse_context, next, &buf, &buf_size) < 0 )
return buf_size; return buf_size;

2
libavcodec/mpegvideo.h
View File

@ -796,7 +796,7 @@ void mpeg1_encode_mb(MpegEncContext *s,
void ff_mpeg1_encode_init(MpegEncContext *s); void ff_mpeg1_encode_init(MpegEncContext *s);
void ff_mpeg1_encode_slice_header(MpegEncContext *s); void ff_mpeg1_encode_slice_header(MpegEncContext *s);
void ff_mpeg1_clean_buffers(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" #include "rl.h"

2
libavcodec/mpegvideo_parser.c
View File

@ -138,7 +138,7 @@ static int mpegvideo_parse(AVCodecParserContext *s,
if(s->flags & PARSER_FLAG_COMPLETE_FRAMES){ if(s->flags & PARSER_FLAG_COMPLETE_FRAMES){
next= buf_size; next= buf_size;
}else{ }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) { if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) {
*poutbuf = NULL; *poutbuf = NULL;