Merge commit 'de4ec972c06d9047bc1b73bb13f858a5d77d8df0'

* commit 'de4ec972c06d9047bc1b73bb13f858a5d77d8df0':
  vc1: fix a memleak.

Conflicts:
	libavcodec/vc1dec.c

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

diff --cc libavcodec/vc1dec.c
index a81f961,4a73d2c..d675659
--- 1/libavcodec/vc1dec.c
--- 2/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@@ -6211,13 -6096,12 +6211,12 @@@ image
          if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) {
              if ((ret = av_frame_ref(pict, &s->current_picture_ptr->f)) < 0)
                  goto err;
 -            ff_print_debug_info(s, s->current_picture_ptr);
 +            ff_print_debug_info(s, s->current_picture_ptr, pict);
+             *got_frame = 1;
          } else if (s->last_picture_ptr != NULL) {
              if ((ret = av_frame_ref(pict, &s->last_picture_ptr->f)) < 0)
                  goto err;
 -            ff_print_debug_info(s, s->last_picture_ptr);
 +            ff_print_debug_info(s, s->last_picture_ptr, pict);
-         }
-         if (s->last_picture_ptr || s->low_delay) {
              *got_frame = 1;
          }
      }