Merge commit 'feaaf5f7f0afac7223457f871af2ec9b99eb6cc6'

* commit 'feaaf5f7f0afac7223457f871af2ec9b99eb6cc6':
  nuv: Reset the frame on resize

Conflicts:
	libavcodec/nuv.c

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

diff --cc libavcodec/nuv.c
index edb38c3,086e57c..36c64fb
--- 1/libavcodec/nuv.c
--- 2/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@@@ -138,7 -134,7 +138,8 @@@ static int codec_reinit(AVCodecContext 
          }
          ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height,
                                c->lq, c->cq);
+         av_frame_unref(&c->pic);
 +        return 1;
      } else if (quality != c->quality)
          ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height,
                                c->lq, c->cq);