Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / nuv.c

diff --git a/libavformat/nuv.c b/libavformat/nuv.c
index 93cbc264c3b0c22976dfd03e31e80493d0e19504..e48c85a789f9998eddff50143b1a8a7364fa213f 100644 (file)
--- a/libavformat/nuv.c
+++ b/libavformat/nuv.c
@@ -122,7 +122,7 @@ static int get_codec_data(AVIOContext *pb, AVStream *vst,
     return 0;
 }
 
-static int nuv_header(AVFormatContext *s, AVFormatParameters *ap) {
+static int nuv_header(AVFormatContext *s) {
     NUVContext *ctx = s->priv_data;
     AVIOContext *pb = s->pb;
     char id_string[12];
@@ -277,7 +277,7 @@ static int nuv_resync(AVFormatContext *s, int64_t pos_limit) {
 
 /**
  * \brief attempts to read a timestamp from stream at the given stream position
- * \return timestamp if successfull and AV_NOPTS_VALUE if failure
+ * \return timestamp if successful and AV_NOPTS_VALUE if failure
  */
 static int64_t nuv_read_dts(AVFormatContext *s, int stream_index,
                             int64_t *ppos, int64_t pos_limit)
@@ -341,5 +341,5 @@ AVInputFormat ff_nuv_demuxer = {
     .read_header    = nuv_header,
     .read_packet    = nuv_packet,
     .read_timestamp = nuv_read_dts,
-    .flags = AVFMT_GENERIC_INDEX,
+    .flags          = AVFMT_GENERIC_INDEX,
 };