Merge commit '1877712c586df2261f2806f45388c77592b89d1e'

[ffmpeg] / libavformat / internal.h

diff --git a/libavformat/internal.h b/libavformat/internal.h
index 8e0cb34d7624a5a5956b36826cc343763f21d8e4..40ba0899b5b552d4776f4c0f130a532be4bee386 100644 (file)
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -401,7 +401,7 @@ int ff_add_param_change(AVPacket *pkt, int32_t channels,
  * Set the timebase for each stream from the corresponding codec timebase and
  * print it.
  */
-int ff_framehash_write_header(AVFormatContext *s, int version);
+int ff_framehash_write_header(AVFormatContext *s);
 
 /**
  * Read a transport packet from a media file.
@@ -522,7 +522,7 @@ int ff_alloc_extradata(AVCodecParameters *par, int size);
  * @param size size of extradata
  * @return >= 0 if OK, AVERROR_xxx on error
  */
-int ff_get_extradata(AVCodecParameters *par, AVIOContext *pb, int size);
+int ff_get_extradata(AVFormatContext *s, AVCodecParameters *par, AVIOContext *pb, int size);
 
 /**
  * add frame for rfps calculation.