diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-12 14:30:33 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-12 14:30:33 +0300 |
| commit | 264ff3dd2e5c0ca9963809730cb95614251b39d5 (patch) | |
| tree | 7712f568c90cb95231890726ec9ea8382af941b9 /libavcodec/utils.c | |
| parent | 30fb54c23f520c4bd1f6563ea1821de96b8f4a17 (diff) | |
| parent | 87a051f97633010f71dfc1d23d806856499bf231 (diff) | |
Merge commit '87a051f97633010f71dfc1d23d806856499bf231'
* commit '87a051f97633010f71dfc1d23d806856499bf231':
lavc: allow asynchronous decoders to return correct pkt_dts values
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 81bc2151ef..3e4cea531a 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2095,7 +2095,8 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi else { ret = avctx->codec->decode(avctx, picture, got_picture_ptr, &tmp); - picture->pkt_dts = avpkt->dts; + if (!(avctx->codec->caps_internal & FF_CODEC_CAP_SETS_PKT_DTS)) + picture->pkt_dts = avpkt->dts; if(!avctx->has_b_frames){ av_frame_set_pkt_pos(picture, avpkt->pos); |