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/libdc1394.c | |
| parent | 3b4aaa61906321b44e9724d9fed11e552406ea50 (diff) | |
lavf: remove AVFormatParameters from AVFormatContext.read_header signature
Diffstat (limited to 'libavdevice/libdc1394.c')
| -rw-r--r-- | libavdevice/libdc1394.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c index ac4bb093d4..934e128f68 100644 --- a/libavdevice/libdc1394.c +++ b/libavdevice/libdc1394.c @@ -117,7 +117,7 @@ static const AVClass libdc1394_class = { }; -static inline int dc1394_read_common(AVFormatContext *c, AVFormatParameters *ap, +static inline int dc1394_read_common(AVFormatContext *c, struct dc1394_frame_format **select_fmt, struct dc1394_frame_rate **select_fps) { dc1394_data* dc1394 = c->priv_data; @@ -191,7 +191,7 @@ out: } #if HAVE_LIBDC1394_1 -static int dc1394_v1_read_header(AVFormatContext *c, AVFormatParameters * ap) +static int dc1394_v1_read_header(AVFormatContext *c) { dc1394_data* dc1394 = c->priv_data; AVStream* vst; @@ -200,7 +200,7 @@ static int dc1394_v1_read_header(AVFormatContext *c, AVFormatParameters * ap) struct dc1394_frame_format *fmt = NULL; struct dc1394_frame_rate *fps = NULL; - if (dc1394_read_common(c,ap,&fmt,&fps) != 0) + if (dc1394_read_common(c, &fmt, &fps) != 0) return -1; /* Now let us prep the hardware. */ @@ -285,7 +285,7 @@ static int dc1394_v1_close(AVFormatContext * context) } #elif HAVE_LIBDC1394_2 -static int dc1394_v2_read_header(AVFormatContext *c, AVFormatParameters * ap) +static int dc1394_v2_read_header(AVFormatContext *c) { dc1394_data* dc1394 = c->priv_data; dc1394camera_list_t *list; @@ -293,7 +293,7 @@ static int dc1394_v2_read_header(AVFormatContext *c, AVFormatParameters * ap) struct dc1394_frame_format *fmt = NULL; struct dc1394_frame_rate *fps = NULL; - if (dc1394_read_common(c,ap,&fmt,&fps) != 0) + if (dc1394_read_common(c, &fmt, &fps) != 0) return -1; /* Now let us prep the hardware. */ |