xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-28 14:01:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mpegvideo: Use the current_picture pts

Browse Source 
The picture slot can be recycled by select_input_picture and
only current_picture is populated with the valid pts.

Unbreak timestamps when in cbr mode.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Michael Niedermayer 2014-04-18 23:11:31 +02:00 committed by Luca Barbato
parent 6f243b17c5
commit 1c7b71a5bd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mpegvideo_enc.c
View File

@ -1664,12 +1664,12 @@ vbv_retry:
avctx->frame_bits = s->frame_bits; avctx->frame_bits = s->frame_bits;
pkt->pts = s->current_picture.f->pts; pkt->pts = s->current_picture.f->pts;
if (!s->low_delay) { if (!s->low_delay && s->pict_type != AV_PICTURE_TYPE_B) {
if (!s->current_picture.f->coded_picture_number) if (!s->current_picture.f->coded_picture_number)
pkt->dts = pkt->pts - s->dts_delta; pkt->dts = pkt->pts - s->dts_delta;
else else
pkt->dts = s->reordered_pts; pkt->dts = s->reordered_pts;
s->reordered_pts = s->input_picture[0]->f->pts; s->reordered_pts = pkt->pts;
} else } else
pkt->dts = pkt->pts; pkt->dts = pkt->pts;
if (s->current_picture.f->key_frame) if (s->current_picture.f->key_frame)