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/pthread_frame.c | |
| parent | 5b281b476b32c35527c0eea5f42161c4acad83f9 (diff) | |
| parent | 549d0bdca53af7a6e0c612ab4b03baecf3a5878f (diff) | |
| download | ffmpeg-1fd76277708cf83572ba243e98f9e848c652f83d.tar.gz | |
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/pthread_frame.c')
| -rw-r--r-- | libavcodec/pthread_frame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 46c6292253..13d682842d 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -800,7 +800,7 @@ int ff_frame_thread_init(AVCodecContext *avctx) } *copy->internal = *src->internal; copy->internal->thread_ctx = p; - copy->internal->pkt = &p->avpkt; + copy->internal->last_pkt_props = &p->avpkt; if (!i) { src = copy; |