diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 7fba5c6aeb..40d689e1f6 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -709,12 +709,13 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi
 
         emms_c(); //needed to avoid an emms_c() call before every return;
 
-        picture->best_effort_timestamp = guess_correct_pts(avctx,
-                                                           picture->pkt_pts,
-                                                           picture->pkt_dts);
 
-        if (*got_picture_ptr)
+        if (*got_picture_ptr){
             avctx->frame_number++;
+            picture->best_effort_timestamp = guess_correct_pts(avctx,
+                                                            picture->pkt_pts,
+                                                            picture->pkt_dts);
+        }
     }else
         ret= 0;