diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 15:57:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 15:57:28 +0100 |
| commit | b36095ea0f668e2b7aac33643a6a33d03433a418 (patch) | |
| tree | c937aa0852722988728bd5063ee871ea5932b9bf /libavformat/tty.c | |
| parent | f506ae19ffb5ad1366a889b4dbec16254db4b755 (diff) | |
| parent | 3e2f200237af977b9253b0aff121eee27bcedb44 (diff) | |
| download | ffmpeg-b36095ea0f668e2b7aac33643a6a33d03433a418.tar.gz | |
Merge commit '3e2f200237af977b9253b0aff121eee27bcedb44'
* commit '3e2f200237af977b9253b0aff121eee27bcedb44':
roqvideodec: fix a potential infinite loop in roqvideo_decode_frame().
xxan: fix invalid memory access in xan_decode_frame_type0()
tty: set avg_frame_rate.
FATE: enable multiple slices in the ffv1 vsynth test
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/tty.c')
| -rw-r--r-- | libavformat/tty.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/tty.c b/libavformat/tty.c index 4c62b5b4cc..9b3fa0ab34 100644 --- a/libavformat/tty.c +++ b/libavformat/tty.c @@ -98,6 +98,7 @@ static int read_header(AVFormatContext *avctx) st->codec->width = width; st->codec->height = height; avpriv_set_pts_info(st, 60, framerate.den, framerate.num); + st->avg_frame_rate = framerate; /* simulate tty display speed */ s->chars_per_frame = FFMAX(av_q2d(st->time_base)*s->chars_per_frame, 1); |