diff options
| author | Michael Niedermayer <[email protected]> | 2014-02-11 23:20:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-02-11 23:21:03 +0100 |
| commit | 707a07f3c2b58331482d850fbe1daad997e90ca3 (patch) | |
| tree | b478c881fb347b37225c2f2a79519898ccb2cadc | |
| parent | bde58d9901589dfd2dc8fcb24c77a7c386b4a1b4 (diff) | |
| parent | 52771346dc7872e39c98508584d430567d3e8f31 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: set AVFrame pkt_pts and reordered_opaque in reget_buffer
Merged-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavcodec/utils.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index c8fd8c65fc..135fd831e5 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1006,8 +1006,11 @@ static int reget_buffer_internal(AVCodecContext *avctx, AVFrame *frame) if (!frame->data[0]) return ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF); - if (av_frame_is_writable(frame)) + if (av_frame_is_writable(frame)) { + frame->pkt_pts = avctx->internal->pkt ? avctx->internal->pkt->pts : AV_NOPTS_VALUE; + frame->reordered_opaque = avctx->reordered_opaque; return 0; + } av_frame_move_ref(&tmp, frame); |