X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Ftty.c;h=1e653e1e09e4e18814da2dffdc9dacf490aa8668;hb=23a287e9cc4bfebd98190f2442367f7c0c94099f;hp=ddf283d8a3c9d5ccfc83eecb5eefb82d75a18135;hpb=7c6c4cf2fb48d7469170e1fc5d9096b95e9b7e9f;p=ffmpeg

diff --git a/libavformat/tty.c b/libavformat/tty.c
index ddf283d8a3c..1e653e1e09e 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) {