Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpeg4video_parser: Drop pointless av_-prefix from static function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/mpeg4video_parser.c

@@ -73,8 +73,7 @@ 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,
+static int mpeg4_decode_header(AVCodecParserContext *s1, AVCodecContext *avctx,
                                const uint8_t *buf, int buf_size)
 {
     struct Mp4vParseContext *pc = s1->priv_data;
@@ -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;