diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-01-12 13:20:36 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-01-27 10:51:57 +0100 |
| commit | 6e9651d1064b6a3e18c24f15d5b03bb9c5fc3393 (patch) | |
| tree | 16acae746d2c37d10c07703437940265b7463fa6 /libavformat/nsvdec.c | |
| parent | 3b4aaa61906321b44e9724d9fed11e552406ea50 (diff) | |
lavf: remove AVFormatParameters from AVFormatContext.read_header signature
Diffstat (limited to 'libavformat/nsvdec.c')
| -rw-r--r-- | libavformat/nsvdec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index 18dfde2867..b5bc87aa8c 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -269,7 +269,7 @@ static int nsv_resync(AVFormatContext *s) return -1; } -static int nsv_parse_NSVf_header(AVFormatContext *s, AVFormatParameters *ap) +static int nsv_parse_NSVf_header(AVFormatContext *s) { NSVContext *nsv = s->priv_data; AVIOContext *pb = s->pb; @@ -391,7 +391,7 @@ static int nsv_parse_NSVf_header(AVFormatContext *s, AVFormatParameters *ap) return 0; } -static int nsv_parse_NSVs_header(AVFormatContext *s, AVFormatParameters *ap) +static int nsv_parse_NSVs_header(AVFormatContext *s) { NSVContext *nsv = s->priv_data; AVIOContext *pb = s->pb; @@ -512,7 +512,7 @@ fail: return -1; } -static int nsv_read_header(AVFormatContext *s, AVFormatParameters *ap) +static int nsv_read_header(AVFormatContext *s) { NSVContext *nsv = s->priv_data; int i, err; @@ -527,10 +527,10 @@ static int nsv_read_header(AVFormatContext *s, AVFormatParameters *ap) if (nsv_resync(s) < 0) return -1; if (nsv->state == NSV_FOUND_NSVF) - err = nsv_parse_NSVf_header(s, ap); + err = nsv_parse_NSVf_header(s); /* we need the first NSVs also... */ if (nsv->state == NSV_FOUND_NSVS) { - err = nsv_parse_NSVs_header(s, ap); + err = nsv_parse_NSVs_header(s); break; /* we just want the first one */ } } @@ -571,7 +571,7 @@ null_chunk_retry: if (err < 0) return err; if (nsv->state == NSV_FOUND_NSVS) - err = nsv_parse_NSVs_header(s, NULL); + err = nsv_parse_NSVs_header(s); if (err < 0) return err; if (nsv->state != NSV_HAS_READ_NSVS && nsv->state != NSV_FOUND_BEEF) |