[FFmpeg-devel] [PATCH 1/2] avcodec/utils: fix packet duration of frames with discarded paddings

[Hendrik Leppkes]

On Sun, Mar 27, 2016 at 6:09 PM, Marton Balint <cus at passwd.hu> wrote:
> Signed-off-by: Marton Balint <cus at passwd.hu>
> ---
>  libavcodec/utils.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/libavcodec/utils.c b/libavcodec/utils.c
> index c625bbc..073c6fa 100644
> --- a/libavcodec/utils.c
> +++ b/libavcodec/utils.c
> @@ -2337,8 +2337,7 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx,
>                      int64_t diff_ts = av_rescale_q(frame->nb_samples - discard_padding,
>                                                     (AVRational){1, avctx->sample_rate},
>                                                     avctx->pkt_timebase);
> -                    if (av_frame_get_pkt_duration(frame) >= diff_ts)
> -                        av_frame_set_pkt_duration(frame, av_frame_get_pkt_duration(frame) - diff_ts);
> +                    av_frame_set_pkt_duration(frame, diff_ts);
>                  } else {
>                      av_log(avctx, AV_LOG_WARNING, "Could not update timestamps for discarded samples.\n");
>                  }
> --
> 2.6.2

Looks correct to me.

- Hendrik