lavc/mpegvideo_enc: simplify timestamp checks in load_input_picture()
authorStefano Sabatini <stefasab@gmail.com>
Thu, 27 Jun 2013 11:05:41 +0000 (13:05 +0200)
committerStefano Sabatini <stefasab@gmail.com>
Thu, 27 Jun 2013 15:46:52 +0000 (17:46 +0200)
Also improve error feedback while at it.

libavcodec/mpegvideo_enc.c

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