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/libdc1394.c | |
| parent | a7c93dae55c045499ffb34a84f8d5031ae594cf9 (diff) | |
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/libdc1394.c')
| -rw-r--r-- | libavdevice/libdc1394.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c index e6161a1386..b6f53454a1 100644 --- a/libavdevice/libdc1394.c +++ b/libavdevice/libdc1394.c @@ -142,16 +142,6 @@ static inline int dc1394_read_common(AVFormatContext *c, AVFormatParameters *ap, av_log(c, AV_LOG_ERROR, "Could not parse framerate '%s'.\n", dc1394->framerate); goto out; } -#if FF_API_FORMAT_PARAMETERS - if (ap->width > 0) - width = ap->width; - if (ap->height > 0) - height = ap->height; - if (ap->pix_fmt) - pix_fmt = ap->pix_fmt; - if (ap->time_base.num) - framerate = (AVRational){ap->time_base.den, ap->time_base.num}; -#endif dc1394->frame_rate = av_rescale(1000, framerate.num, framerate.den); for (fmt = dc1394_frame_formats; fmt->width; fmt++) @@ -212,11 +202,6 @@ static int dc1394_v1_read_header(AVFormatContext *c, AVFormatParameters * ap) if (dc1394_read_common(c,ap,&fmt,&fps) != 0) return -1; -#if FF_API_FORMAT_PARAMETERS - if (ap->channel) - dc1394->channel = ap->channel; -#endif - /* Now let us prep the hardware. */ dc1394->handle = dc1394_create_handle(0); /* FIXME: gotta have ap->port */ if (!dc1394->handle) { |