Merge commit '305d3d9f1f7f0bdc18744f376a0ff5b012e4e6cf'

[ffmpeg] / libavformat / internal.h

diff --git a/libavformat/internal.h b/libavformat/internal.h
index 36ee4c0be96123f59ee434a2bf82389e4ecebf0e..8e53cc54a122307a6aafcd671d502d0cab8ebb2b 100644 (file)
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -357,9 +357,10 @@ enum AVCodecID ff_get_pcm_codec_id(int bps, int flt, int be, int sflags);
 AVRational ff_choose_timebase(AVFormatContext *s, AVStream *st, int min_precission);
 
 /**
- * Generate standard extradata for AVC-Intra based on width/height and field order.
+ * Generate standard extradata for AVC-Intra based on width/height and field
+ * order.
  */
-void ff_generate_avci_extradata(AVStream *st);
+int ff_generate_avci_extradata(AVStream *st);
 
 /**
  * Allocate extradata with additional FF_INPUT_BUFFER_PADDING_SIZE at end