virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '99404597201911de90cff2ef85f2d44176d39147'

Browse Source 
* 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
parent 264ff3dd2e 9940459720
commit e75b2e9c4b
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mmaldec.c
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 == MMAL_TIME_UNKNOWN ? AV_NOPTS_VALUE : buffer->pts;
frame->pkt_pts = buffer->pts; frame->pkt_dts = AV_NOPTS_VALUE;
frame->pts = buffer->pts;
}
done: done:
return ret; return ret;