aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2011-02-02 21:54:14 +0100
committerMans Rullgard <mans@mansr.com>2011-02-03 00:25:35 +0000
commit62ecd3635a1329c49bc3b97ba84ad4d53d847163 (patch)
treeead1e983026db05e8bdb2e6dfc30c39e171c6118
parentce41c51b0c71c87f623914ba0786aef325d818fe (diff)
downloadffmpeg-62ecd3635a1329c49bc3b97ba84ad4d53d847163.tar.gz
Set pkt_pts in avcodec_default_reget_buffer()
This was missed when pkt_pts was first added. Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Mans Rullgard <mans@mansr.com>
-rw-r--r--libavcodec/utils.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 53a0674323..e9db33e9d7 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -396,6 +396,8 @@ int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic){
/* If internal buffer type return the same buffer */
if(pic->type == FF_BUFFER_TYPE_INTERNAL) {
+ if(s->pkt) pic->pkt_pts= s->pkt->pts;
+ else pic->pkt_pts= AV_NOPTS_VALUE;
pic->reordered_opaque= s->reordered_opaque;
return 0;
}