diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2011-02-02 21:54:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-04 03:10:10 +0100 |
| commit | cf96cce728fdc83a6ebf98997ebf90c3c2ec2052 (patch) | |
| tree | 1323ea6dd061b261388db01f81d7261665b6f54a /libavcodec/utils.c | |
| parent | d0d8a9b1384ba3cd465d6ef3439f3979d4518b4b (diff) | |
| download | ffmpeg-cf96cce728fdc83a6ebf98997ebf90c3c2ec2052.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>
(cherry picked from commit 62ecd3635a1329c49bc3b97ba84ad4d53d847163)
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 2 |
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; } |