ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-30 10:10:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

lavc: set best effort timestamp if unset when using new decode API

Browse Source 
Some API users (in particular ffmpeg.c) check the best effort timestamp
only.
This commit is contained in:
wm4 2016-10-05 11:35:54 +02:00
parent 5173ffb27f
commit 40fbf32042
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/utils.c
View File

@ -2870,7 +2870,14 @@ int attribute_align_arg avcodec_receive_frame(AVCodecContext *avctx, AVFrame *fr
if (avctx->codec->receive_frame) {
if (avctx->internal->draining && !(avctx->codec->capabilities & AV_CODEC_CAP_DELAY))
return AVERROR_EOF;
return avctx->codec->receive_frame(avctx, frame);
ret = avctx->codec->receive_frame(avctx, frame);
if (ret >= 0) {
if (av_frame_get_best_effort_timestamp(frame) == AV_NOPTS_VALUE) {
av_frame_set_best_effort_timestamp(frame,
guess_correct_pts(avctx, frame->pkt_pts, frame->pkt_dts));
}
}
return ret;
}
// Emulation via old API.