On Sun, Oct 2, 2016 at 6:22 PM, Hendrik Leppkes <h.lepp...@gmail.com> wrote:
> On Sat, Oct 1, 2016 at 4:15 PM, Hendrik Leppkes <h.lepp...@gmail.com> wrote:
>> Decoders have previously not used AVFrame.pts, and with the upcoming
>> deprecation of pkt_pts (in favor of pts), this would lead to an errorneous
>> interpration of timestamps.
>> ---
>> ffmpeg.c | 7 +------
>> 1 file changed, 1 insertion(+), 6 deletions(-)
>>
>> diff --git a/ffmpeg.c b/ffmpeg.c
>> index 9a8e65a..cdbf3d4 100644
>> --- a/ffmpeg.c
>> +++ b/ffmpeg.c
>> @@ -2058,12 +2058,7 @@ static int decode_audio(InputStream *ist, AVPacket
>> *pkt, int *got_output)
>> }
>> }
>>
>> - /* if the decoder provides a pts, use it instead of the last packet pts.
>> - the decoder could be delaying output by a packet or more. */
>> - if (decoded_frame->pts != AV_NOPTS_VALUE) {
>> - ist->dts = ist->next_dts = ist->pts = ist->next_pts =
>> av_rescale_q(decoded_frame->pts, avctx->time_base, AV_TIME_BASE_Q);
>> - decoded_frame_tb = avctx->time_base;
>> - } else if (decoded_frame->pkt_pts != AV_NOPTS_VALUE) {
>> + if (decoded_frame->pkt_pts != AV_NOPTS_VALUE) {
>> decoded_frame->pts = decoded_frame->pkt_pts;
>> decoded_frame_tb = ist->st->time_base;
>> } else if (pkt->pts != AV_NOPTS_VALUE) {
>> --
>
> Ping.
Last chance for further comments, otherwise I'll apply in the morning
(~8 hours from now), so that merges can continue.
- Hendrik
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
