aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-03-04 04:24:16 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-03-04 04:24:16 +0100
commitad82bf9ce0de510f758d08f8c396dcd0460df8fd (patch)
treedb4d03d997f1e227cb1f3b60061f083594a51699
parent3088635a44853f32852bf53980731f3d523d8a54 (diff)
downloadffmpeg-ad82bf9ce0de510f758d08f8c396dcd0460df8fd.tar.gz
Move guess_correct_pts() under got_picture_ptr.
-rw-r--r--libavcodec/utils.c9
1 files changed, 5 insertions, 4 deletions
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;