summaryrefslogtreecommitdiff
path: root/libavformat/tty.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-07-17 07:45:33 +0200
committerAnton Khirnov <anton@khirnov.net>2011-08-15 19:59:48 +0200
commitc14fe6bc99eba55c6e52b3f3c606bb458f8a0a8e (patch)
treecfa74cd6c190a908314abca96d9c2f2f59b1d7fb /libavformat/tty.c
parenta7c93dae55c045499ffb34a84f8d5031ae594cf9 (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 'libavformat/tty.c')
-rw-r--r--libavformat/tty.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/libavformat/tty.c b/libavformat/tty.c
index ee6b2f1334..58e2946346 100644
--- a/libavformat/tty.c
+++ b/libavformat/tty.c
@@ -95,23 +95,11 @@ static int read_header(AVFormatContext *avctx,
av_log(avctx, AV_LOG_ERROR, "Could not parse framerate: %s.\n", s->framerate);
goto fail;
}
-#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->codec->width = width;
st->codec->height = height;
av_set_pts_info(st, 60, framerate.den, framerate.num);
/* simulate tty display speed */
-#if FF_API_FORMAT_PARAMETERS
- if (ap->sample_rate)
- s->chars_per_frame = ap->sample_rate;
-#endif
s->chars_per_frame = FFMAX(av_q2d(st->time_base)*s->chars_per_frame, 1);
if (avctx->pb->seekable) {