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/bktr.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/bktr.c')
| -rw-r--r-- | libavdevice/bktr.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c index f1ae9ea685..7ff46cf8a3 100644 --- a/libavdevice/bktr.c +++ b/libavdevice/bktr.c @@ -251,17 +251,6 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) AVRational framerate; int ret = 0; -#if FF_API_FORMAT_PARAMETERS - if (ap->standard) { - if (!strcasecmp(ap->standard, "pal")) - s->standard = PAL; - else if (!strcasecmp(ap->standard, "secam")) - s->standard = SECAM; - else if (!strcasecmp(ap->standard, "ntsc")) - s->standard = NTSC; - } -#endif - if ((ret = av_parse_video_size(&width, &height, s->video_size)) < 0) { av_log(s1, AV_LOG_ERROR, "Could not parse video size '%s'.\n", s->video_size); goto out; @@ -281,14 +270,6 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) av_log(s1, AV_LOG_ERROR, "Could not parse framerate '%s'.\n", s->framerate); goto out; } -#if FF_API_FORMAT_PARAMETERS - if (ap->width > 0) - width = ap->width; - if (ap->height > 0) - height = ap->height; - if (ap->time_base.num) - framerate = (AVRational){ap->time_base.den, ap->time_base.num}; -#endif st = av_new_stream(s1, 0); if (!st) { |