[FFmpeg-cvslog] lavc/mpegvideo_enc: simplify timestamp checks in load_input_picture()

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Jun 27 13:05:41 2013 +0200| [7eb6eb03d83a4d6454ce1e20ec672dbf99f8f009] | committer: Stefano Sabatini

lavc/mpegvideo_enc: simplify timestamp checks in load_input_picture()

Also improve error feedback while at it.

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

 libavcodec/mpegvideo_enc.c |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index de018e3..cce5991 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -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 {