virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavc/mpegvideo_enc: simplify timestamp checks in load_input_picture()

Browse Source 
Also improve error feedback while at it.
This commit is contained in:
Stefano Sabatini 2013-06-27 13:05:41 +02:00
parent c4db4b1756
commit 7eb6eb03d8
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/mpegvideo_enc.c
View File

@ -956,18 +956,17 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg)
if (pts != AV_NOPTS_VALUE) { if (pts != AV_NOPTS_VALUE) {
if (s->user_specified_pts != AV_NOPTS_VALUE) { if (s->user_specified_pts != AV_NOPTS_VALUE) {
int64_t time = pts;
int64_t last = s->user_specified_pts; int64_t last = s->user_specified_pts;
if (time <= last) { if (pts <= last) {
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"Error, Invalid timestamp=%"PRId64", " "Invalid pts (%"PRId64") <= last (%"PRId64")\n",
"last=%"PRId64"\n", pts, s->user_specified_pts); pts, last);
return -1; return AVERROR(EINVAL);
} }
if (!s->low_delay && display_picture_number == 1) if (!s->low_delay && display_picture_number == 1)
s->dts_delta = time - last; s->dts_delta = pts - last;
} }
s->user_specified_pts = pts; s->user_specified_pts = pts;
} else { } else {