diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 15:42:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 15:43:03 +0100 |
| commit | c427b2b86e726159873eb6cc4f7153c5bd778c55 (patch) | |
| tree | bf84ff8620f5b1940aa8af20e0c5478267f59955 | |
| parent | add54280bfc101b842959e5fb96260cdb0882954 (diff) | |
| parent | 4bcca3611da24583dfbb8a1cc4c404a7deaa5590 (diff) | |
| download | ffmpeg-c427b2b86e726159873eb6cc4f7153c5bd778c55.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpeg4video_parser: Drop pointless av_-prefix from static function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpeg4video_parser.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/mpeg4video_parser.c b/libavcodec/mpeg4video_parser.c index 96ed519571..86bcc9eb53 100644 --- a/libavcodec/mpeg4video_parser.c +++ b/libavcodec/mpeg4video_parser.c @@ -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 */ -static int av_mpeg4_decode_header(AVCodecParserContext *s1, - AVCodecContext *avctx, - const uint8_t *buf, int buf_size) +static int mpeg4_decode_header(AVCodecParserContext *s1, AVCodecContext *avctx, + const uint8_t *buf, int buf_size) { struct Mp4vParseContext *pc = s1->priv_data; Mpeg4DecContext *dec_ctx = &pc->dec_ctx; @@ -143,7 +142,7 @@ static int mpeg4video_parse(AVCodecParserContext *s, return buf_size; } } - av_mpeg4_decode_header(s, avctx, buf, buf_size); + mpeg4_decode_header(s, avctx, buf, buf_size); *poutbuf = buf; *poutbuf_size = buf_size; |