diff options
| author | James Almer <jamrial@gmail.com> | 2017-04-22 20:06:47 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-04-22 20:06:47 -0300 |
| commit | 1fd76277708cf83572ba243e98f9e848c652f83d (patch) | |
| tree | a6dc1008a0d893df430a9debbdc201d8e8305954 /libavcodec/rawdec.c | |
| parent | 5b281b476b32c35527c0eea5f42161c4acad83f9 (diff) | |
| parent | 549d0bdca53af7a6e0c612ab4b03baecf3a5878f (diff) | |
Merge commit '549d0bdca53af7a6e0c612ab4b03baecf3a5878f'
* commit '549d0bdca53af7a6e0c612ab4b03baecf3a5878f':
decode: be more explicit about storing the last packet properties
Also copy pkt->size in extract_packet_props(), as it's needed for
AVFrame.pkt_size
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/rawdec.c')
| -rw-r--r-- | libavcodec/rawdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index e53eb2eacc..6dcb5f2e66 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -237,8 +237,8 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame, if (res < 0) return res; - av_frame_set_pkt_pos (frame, avctx->internal->pkt->pos); - av_frame_set_pkt_duration(frame, avctx->internal->pkt->duration); + av_frame_set_pkt_pos (frame, avctx->internal->last_pkt_props->pos); + av_frame_set_pkt_duration(frame, avctx->internal->last_pkt_props->duration); if (context->tff >= 0) { frame->interlaced_frame = 1; |