Merge commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9'

* commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9':
  lavc: move AVCodecContext.pkt to AVCodecInternal

Conflicts:
	libavcodec/internal.h
	libavcodec/rawdec.c
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 1 insertions, 1 deletions

diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c
index b46304fb01..cfbc9643ee 100644
--- a/libavcodec/pthread_frame.c
+++ b/libavcodec/pthread_frame.c
@@ -656,7 +656,6 @@ int ff_frame_thread_init(AVCodecContext *avctx)
         }
 
         *copy = *src;
-        copy->pkt = &p->avpkt;
 
         copy->internal = av_malloc(sizeof(AVCodecInternal));
         if (!copy->internal) {
@@ -665,6 +664,7 @@ int ff_frame_thread_init(AVCodecContext *avctx)
         }
         *copy->internal = *src->internal;
         copy->internal->thread_ctx = p;
+        copy->internal->pkt = &p->avpkt;
 
         if (!i) {
             src = copy;