diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-12 13:30:41 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-12 13:30:41 +0200 |
| commit | e75b2e9c4b91ba9056768e343956d37169445685 (patch) | |
| tree | 7596a50adc0ac1b919f41a93bfd48cc85f428cf7 /libavcodec | |
| parent | 264ff3dd2e5c0ca9963809730cb95614251b39d5 (diff) | |
| parent | 99404597201911de90cff2ef85f2d44176d39147 (diff) | |
| download | ffmpeg-e75b2e9c4b91ba9056768e343956d37169445685.tar.gz | |
Merge commit '99404597201911de90cff2ef85f2d44176d39147'
* commit '99404597201911de90cff2ef85f2d44176d39147':
mmaldec: fix pkt_dts determination
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mmaldec.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index a70c51b8e3..a41a1b67be 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -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; |