RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/decode: also check for FF_CODEC_CAP_SETS_PKT_DTS in audio decoders 

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-05-01 20:01:22 -03:00
parent 79aa2ff199
commit b3570f0389
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/decode.c
View File

@ -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();