Merge commit '2dd464868c64fa21a6e3bd63ad364ff12999c7d0'

[ffmpeg] / libavcodec / pthread_frame.c

diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c
index 5b5f5fb28926082a30ed4d141929f8e892fb1f74..4e1ad9d686392803d6b7fd5645e05c62eae0241c 100644 (file)
--- a/libavcodec/pthread_frame.c
+++ b/libavcodec/pthread_frame.c
@@ -250,6 +250,7 @@ static int update_context_from_thread(AVCodecContext *dst, AVCodecContext *src,
         dst->width     = src->width;
         dst->height    = src->height;
         dst->pix_fmt   = src->pix_fmt;
+        dst->sw_pix_fmt = src->sw_pix_fmt;
 
         dst->coded_width  = src->coded_width;
         dst->coded_height = src->coded_height;