diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-14 10:44:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-14 10:44:55 +0200 |
| commit | 1dee467d262d5b376fa506a0da5325b12ceea51a (patch) | |
| tree | b927d6242382ebf5591937f211a7cb7431cf260e /libavcodec | |
| parent | 86fe16a763abf2d44a9d3c2ed6d19324239731e4 (diff) | |
| parent | feaaf5f7f0afac7223457f871af2ec9b99eb6cc6 (diff) | |
| download | ffmpeg-1dee467d262d5b376fa506a0da5325b12ceea51a.tar.gz | |
Merge commit 'feaaf5f7f0afac7223457f871af2ec9b99eb6cc6'
* commit 'feaaf5f7f0afac7223457f871af2ec9b99eb6cc6':
nuv: Reset the frame on resize
Conflicts:
libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/nuv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index edb38c303e..36c64fb44c 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -138,6 +138,7 @@ static int codec_reinit(AVCodecContext *avctx, int width, int height, } 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, |