[FFmpeg-cvslog] ffplay: stats: do not dereference NULL video
Nicolas George
git
Fri Feb 11 19:10:20 CET 2011
ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Tue Feb 8 11:57:08 2011 +0100| [d6705a27d8e681449ab2dbc68c6e7dd344160166] | committer: Nicolas George
ffplay: stats: do not dereference NULL video
Also: cosmetic: split this overly long line
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d6705a27d8e681449ab2dbc68c6e7dd344160166
---
ffplay.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ffplay.c b/ffplay.c
index ba7e48c..3dcca98 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1284,7 +1284,14 @@ retry:
if (is->audio_st && is->video_st)
av_diff = get_audio_clock(is) - get_video_clock(is);
printf("%7.2f A-V:%7.3f s:%3.1f aq=%5dKB vq=%5dKB sq=%5dB f=%"PRId64"/%"PRId64" \r",
- get_master_clock(is), av_diff, FFMAX(is->skip_frames-1, 0), aqsize / 1024, vqsize / 1024, sqsize, is->video_st->codec->pts_correction_num_faulty_dts, is->video_st->codec->pts_correction_num_faulty_pts);
+ get_master_clock(is),
+ av_diff,
+ FFMAX(is->skip_frames-1, 0),
+ aqsize / 1024,
+ vqsize / 1024,
+ sqsize,
+ is->video_st ? is->video_st->codec->pts_correction_num_faulty_dts : 0,
+ is->video_st ? is->video_st->codec->pts_correction_num_faulty_pts : 0);
fflush(stdout);
last_time = cur_time;
}
More information about the ffmpeg-cvslog
mailing list