RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master' 

* qatar/master:
  mpeg4video_parser: Drop pointless av_-prefix from static function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-20 15:42:50 +01:00
parent add54280bf 4bcca3611d
commit c427b2b86e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/mpeg4video_parser.c
View File

@ -73,9 +73,8 @@ int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size)
} }
/* XXX: make it use less memory */ /* XXX: make it use less memory */
static int av_mpeg4_decode_header(AVCodecParserContext *s1, static int mpeg4_decode_header(AVCodecParserContext *s1, AVCodecContext *avctx,
AVCodecContext *avctx, const uint8_t *buf, int buf_size)
const uint8_t *buf, int buf_size)
{ {
struct Mp4vParseContext *pc = s1->priv_data; struct Mp4vParseContext *pc = s1->priv_data;
Mpeg4DecContext *dec_ctx = &pc->dec_ctx; Mpeg4DecContext *dec_ctx = &pc->dec_ctx;
@ -143,7 +142,7 @@ static int mpeg4video_parse(AVCodecParserContext *s,
return buf_size; return buf_size;
} }
} }
av_mpeg4_decode_header(s, avctx, buf, buf_size); mpeg4_decode_header(s, avctx, buf, buf_size);
*poutbuf = buf; *poutbuf = buf;
*poutbuf_size = buf_size; *poutbuf_size = buf_size;