[FFmpeg-cvslog] avplay: Don't try to scale timestamps if the tb isn't set

Martin Storsjö git at videolan.org
Sat Apr 7 23:03:28 CEST 2012


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Fri Apr  6 13:51:34 2012 +0300| [951e715cebfaffced7f13c1525771ff917fe1d38] | committer: Martin Storsjö

avplay: Don't try to scale timestamps if the tb isn't set

If get_filtered_video_frame failed above, tb might not be
initialized at all, so don't scale using it.

This fixes cases where avplay could crash if aborting
avformat_find_stream_info with ctrl+c.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=951e715cebfaffced7f13c1525771ff917fe1d38
---

 avplay.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/avplay.c b/avplay.c
index d9c1786..d1cf53d 100644
--- a/avplay.c
+++ b/avplay.c
@@ -1796,7 +1796,7 @@ static int video_thread(void *arg)
             frame->opaque = picref;
         }
 
-        if (av_cmp_q(tb, is->video_st->time_base)) {
+        if (ret >= 0 && av_cmp_q(tb, is->video_st->time_base)) {
             av_unused int64_t pts1 = pts_int;
             pts_int = av_rescale_q(pts_int, tb, is->video_st->time_base);
             av_dlog(NULL, "video_thread(): "



More information about the ffmpeg-cvslog mailing list