Commit 1c7b71a5 authored by Michael Niedermayer's avatar Michael Niedermayer Committed by Luca Barbato

mpegvideo: Use the current_picture pts

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: 's avatarLuca Barbato <>
parent 6f243b17
......@@ -1664,12 +1664,12 @@ vbv_retry:
avctx->frame_bits = s->frame_bits;
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)
pkt->dts = pkt->pts - s->dts_delta;
pkt->dts = s->reordered_pts;
s->reordered_pts = s->input_picture[0]->f->pts;
s->reordered_pts = pkt->pts;
} else
pkt->dts = pkt->pts;
if (s->current_picture.f->key_frame)
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