[FFmpeg-cvslog] ffv1dec: defuse membomb

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 19 13:56:13 2013 +0200| [a3264b4ba1e59b6df16d8ed112c943725cc00bfb] | committer: Michael Niedermayer

ffv1dec: defuse membomb

Fixes Ticket2589

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a3264b4ba1e59b6df16d8ed112c943725cc00bfb
---

 libavcodec/ffv1dec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index eb2a1f0..ddd307f 100644
--- 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++) {