Merge commit '564b7e0c0095768cd20001b28154d69462be54e7'

[ffmpeg] / libavcodec / ffv1dec.c

diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index eb2a1f0fea031493bd62196baf918e6ac8b169f5..ddd307fddfb51724aa22b7e653529da4f1e66ce8 100644 (file)
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@@ -918,7 +918,7 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src)
     if (dst == src)
         return 0;
 
-    if (!fdst->quant_table_count) {
+    if (!fdst->picture.f) {
         memcpy(fdst, fsrc, sizeof(*fdst));
 
         for (i = 0; i < fdst->quant_table_count; i++) {