From 6e9651d1064b6a3e18c24f15d5b03bb9c5fc3393 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 12 Jan 2012 13:20:36 +0100 Subject: lavf: remove AVFormatParameters from AVFormatContext.read_header signature --- libavdevice/alsa-audio-dec.c | 3 +-- libavdevice/bktr.c | 2 +- libavdevice/dv1394.c | 2 +- libavdevice/fbdev.c | 3 +-- libavdevice/jack_audio.c | 2 +- libavdevice/libcdio.c | 2 +- libavdevice/libdc1394.c | 10 +++++----- libavdevice/oss_audio.c | 2 +- libavdevice/pulse.c | 3 +-- libavdevice/sndio_dec.c | 3 +-- libavdevice/v4l2.c | 6 +++--- libavdevice/vfwcap.c | 2 +- libavdevice/x11grab.c | 2 +- 13 files changed, 19 insertions(+), 23 deletions(-) (limited to 'libavdevice') diff --git a/libavdevice/alsa-audio-dec.c b/libavdevice/alsa-audio-dec.c index 5344b1988d..b6a7ac20fe 100644 --- a/libavdevice/alsa-audio-dec.c +++ b/libavdevice/alsa-audio-dec.c @@ -52,8 +52,7 @@ #include "alsa-audio.h" -static av_cold int audio_read_header(AVFormatContext *s1, - AVFormatParameters *ap) +static av_cold int audio_read_header(AVFormatContext *s1) { AlsaData *s = s1->priv_data; AVStream *st; diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c index 8abe5ef18f..b35ec7cc87 100644 --- a/libavdevice/bktr.c +++ b/libavdevice/bktr.c @@ -243,7 +243,7 @@ static int grab_read_packet(AVFormatContext *s1, AVPacket *pkt) return video_buf_size; } -static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) +static int grab_read_header(AVFormatContext *s1) { VideoData *s = s1->priv_data; AVStream *st; diff --git a/libavdevice/dv1394.c b/libavdevice/dv1394.c index 69e59ec19b..f48d2b1506 100644 --- a/libavdevice/dv1394.c +++ b/libavdevice/dv1394.c @@ -81,7 +81,7 @@ static int dv1394_start(struct dv1394_data *dv) return 0; } -static int dv1394_read_header(AVFormatContext * context, AVFormatParameters * ap) +static int dv1394_read_header(AVFormatContext * context) { struct dv1394_data *dv = context->priv_data; diff --git a/libavdevice/fbdev.c b/libavdevice/fbdev.c index 7444f47e57..f1889ef79e 100644 --- a/libavdevice/fbdev.c +++ b/libavdevice/fbdev.c @@ -95,8 +95,7 @@ typedef struct { uint8_t *data; ///< framebuffer data } FBDevContext; -av_cold static int fbdev_read_header(AVFormatContext *avctx, - AVFormatParameters *ap) +av_cold static int fbdev_read_header(AVFormatContext *avctx) { FBDevContext *fbdev = avctx->priv_data; AVStream *st = NULL; diff --git a/libavdevice/jack_audio.c b/libavdevice/jack_audio.c index e68559e4d3..9f1bb23c3b 100644 --- a/libavdevice/jack_audio.c +++ b/libavdevice/jack_audio.c @@ -221,7 +221,7 @@ static void stop_jack(JackData *self) ff_timefilter_destroy(self->timefilter); } -static int audio_read_header(AVFormatContext *context, AVFormatParameters *params) +static int audio_read_header(AVFormatContext *context) { JackData *self = context->priv_data; AVStream *stream; diff --git a/libavdevice/libcdio.c b/libavdevice/libcdio.c index e00272c115..747adf9141 100644 --- a/libavdevice/libcdio.c +++ b/libavdevice/libcdio.c @@ -46,7 +46,7 @@ typedef struct CDIOContext { int paranoia_mode; } CDIOContext; -static av_cold int read_header(AVFormatContext *ctx, AVFormatParameters *ap) +static av_cold int read_header(AVFormatContext *ctx) { CDIOContext *s = ctx->priv_data; AVStream *st; 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. */ diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c index 308fc0df97..e592c32849 100644 --- a/libavdevice/oss_audio.c +++ b/libavdevice/oss_audio.c @@ -204,7 +204,7 @@ static int audio_write_trailer(AVFormatContext *s1) /* grab support */ -static int audio_read_header(AVFormatContext *s1, AVFormatParameters *ap) +static int audio_read_header(AVFormatContext *s1) { AudioData *s = s1->priv_data; AVStream *st; diff --git a/libavdevice/pulse.c b/libavdevice/pulse.c index bffe3914b8..da6ee72e8e 100644 --- a/libavdevice/pulse.c +++ b/libavdevice/pulse.c @@ -66,8 +66,7 @@ static pa_sample_format_t codec_id_to_pulse_format(int codec_id) { } } -static av_cold int pulse_read_header(AVFormatContext *s, - AVFormatParameters *ap) +static av_cold int pulse_read_header(AVFormatContext *s) { PulseData *pd = s->priv_data; AVStream *st; diff --git a/libavdevice/sndio_dec.c b/libavdevice/sndio_dec.c index cc74c38a39..840dd097a3 100644 --- a/libavdevice/sndio_dec.c +++ b/libavdevice/sndio_dec.c @@ -28,8 +28,7 @@ #include "sndio_common.h" -static av_cold int audio_read_header(AVFormatContext *s1, - AVFormatParameters *ap) +static av_cold int audio_read_header(AVFormatContext *s1) { SndioData *s = s1->priv_data; AVStream *st; 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); diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c index b5baee3b79..44cb813bd9 100644 --- a/libavdevice/vfwcap.c +++ b/libavdevice/vfwcap.c @@ -238,7 +238,7 @@ static int vfw_read_close(AVFormatContext *s) return 0; } -static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap) +static int vfw_read_header(AVFormatContext *s) { struct vfw_ctx *ctx = s->priv_data; AVCodecContext *codec; diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c index 9d12b2f731..bf3011bac8 100644 --- a/libavdevice/x11grab.c +++ b/libavdevice/x11grab.c @@ -154,7 +154,7 @@ x11grab_region_win_init(struct x11_grab *s) * */ static int -x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) +x11grab_read_header(AVFormatContext *s1) { struct x11_grab *x11grab = s1->priv_data; Display *dpy; -- cgit v1.2.3