Merge commit '99404597201911de90cff2ef85f2d44176d39147'

* commit '99404597201911de90cff2ef85f2d44176d39147':
  mmaldec: fix pkt_dts determination

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-09-12 13:30:41 +02:00
commit e75b2e9c4b

View File

@ -619,10 +619,8 @@ static int ffmal_copy_frame(AVCodecContext *avctx, AVFrame *frame,
}
}
if (buffer->pts != MMAL_TIME_UNKNOWN) {
frame->pkt_pts = buffer->pts;
frame->pts = buffer->pts;
}
frame->pkt_pts = buffer->pts == MMAL_TIME_UNKNOWN ? AV_NOPTS_VALUE : buffer->pts;
frame->pkt_dts = AV_NOPTS_VALUE;
done:
return ret;