diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-07-17 07:45:33 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-08-15 19:59:48 +0200 |
| commit | c14fe6bc99eba55c6e52b3f3c606bb458f8a0a8e (patch) | |
| tree | cfa74cd6c190a908314abca96d9c2f2f59b1d7fb /libavdevice/v4l2.c | |
| parent | a7c93dae55c045499ffb34a84f8d5031ae594cf9 (diff) | |
| download | ffmpeg-c14fe6bc99eba55c6e52b3f3c606bb458f8a0a8e.tar.gz | |
lavf,lavd: remove all usage of AVFormatParameters from demuxers.
AVFormatParameters are converted into corresponding private options in
av_open_input_file/stream() compat wrappers, so accessing them from
demuxers is redundant.
Diffstat (limited to 'libavdevice/v4l2.c')
| -rw-r--r-- | libavdevice/v4l2.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 072be48d40..7a501a901c 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -463,12 +463,6 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap) av_log(s1, AV_LOG_ERROR, "Could not parse framerate '%s'.\n", s->framerate); return ret; } -#if FF_API_FORMAT_PARAMETERS - if (ap->channel > 0) - s->channel = ap->channel; - if (ap->time_base.num) - framerate_q = (AVRational){ap->time_base.den, ap->time_base.num}; -#endif /* set tv video input */ memset (&input, 0, sizeof (input)); @@ -486,13 +480,6 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap) return AVERROR(EIO); } -#if FF_API_FORMAT_PARAMETERS - if (ap->standard) { - av_freep(&s->standard); - s->standard = av_strdup(ap->standard); - } -#endif - if (s->standard) { av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set standard: %s\n", s->standard); @@ -609,14 +596,6 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap) res = AVERROR(EINVAL); goto out; } -#if FF_API_FORMAT_PARAMETERS - if (ap->width > 0) - s->width = ap->width; - if (ap->height > 0) - s->height = ap->height; - if (ap->pix_fmt) - pix_fmt = ap->pix_fmt; -#endif capabilities = 0; s->fd = device_open(s1, &capabilities); |