ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Mon May 1 20:01:22 2017 -0300| [b3570f03893cc6f29472f418a144252fe7a5e207] | committer: James Almer
avcodec/decode: also check for FF_CODEC_CAP_SETS_PKT_DTS in audio decoders Reviewed-by: Michael Niedermayer <mich...@niedermayer.cc> Signed-off-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b3570f03893cc6f29472f418a144252fe7a5e207 --- libavcodec/decode.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index e330f14826..708071fd07 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -413,9 +413,9 @@ FF_ENABLE_DEPRECATION_WARNINGS } else { ret = avctx->codec->decode(avctx, frame, &got_frame, &tmp); + 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->codec->caps_internal & FF_CODEC_CAP_SETS_PKT_DTS)) - frame->pkt_dts = pkt->dts; 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(); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
