OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3088635
)
Move guess_correct_pts() under got_picture_ptr.
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 4 Mar 2011 03:24:16 +0000
(
04:24
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 4 Mar 2011 03:24:16 +0000
(
04:24
+0100)
libavcodec/utils.c
patch
|
blob
|
history
diff --git
a/libavcodec/utils.c
b/libavcodec/utils.c
index
7fba5c6
..
40d689e
100644
(file)
--- 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;