Commit b3570f03 authored by James Almer's avatar James Almer

avcodec/decode: also check for FF_CODEC_CAP_SETS_PKT_DTS in audio decoders

Reviewed-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent 79aa2ff1
......@@ -413,9 +413,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
} else {
ret = avctx->codec->decode(avctx, frame, &got_frame, &tmp);
if (avctx->codec->type == AVMEDIA_TYPE_VIDEO) {
if (!(avctx->codec->caps_internal & FF_CODEC_CAP_SETS_PKT_DTS))
frame->pkt_dts = pkt->dts;
if (avctx->codec->type == AVMEDIA_TYPE_VIDEO) {
if(!avctx->has_b_frames)
frame->pkt_pos = pkt->pos;
//FIXME these should be under if(!avctx->has_b_frames)
......@@ -426,8 +426,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (!frame->height) frame->height = avctx->height;
if (frame->format == AV_PIX_FMT_NONE) frame->format = avctx->pix_fmt;
}
} else if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) {
frame->pkt_dts = pkt->dts;
}
}
emms_c();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment