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 /libavdevice/v4l2.c | |
| parent | 3b4aaa61906321b44e9724d9fed11e552406ea50 (diff) | |
lavf: remove AVFormatParameters from AVFormatContext.read_header signature
Diffstat (limited to 'libavdevice/v4l2.c')
| -rw-r--r-- | libavdevice/v4l2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 191decde2a..b9941d212c 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -543,7 +543,7 @@ static void mmap_close(struct video_data *s) av_free(s->buf_len); } -static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap) +static int v4l2_set_parameters(AVFormatContext *s1) { struct video_data *s = s1->priv_data; struct v4l2_input input = { 0 }; @@ -678,7 +678,7 @@ static uint32_t device_try_init(AVFormatContext *s1, return desired_format; } -static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap) +static int v4l2_read_header(AVFormatContext *s1) { struct video_data *s = s1->priv_data; AVStream *st; @@ -766,7 +766,7 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap) s->frame_format = desired_format; - if ((res = v4l2_set_parameters(s1, ap) < 0)) + if ((res = v4l2_set_parameters(s1) < 0)) goto out; st->codec->pix_fmt = fmt_v4l2ff(desired_format, codec_id); |