Merge commit 'b7462a3904d71ff799584faf5b875cad59ca2f31'

* commit 'b7462a3904d71ff799584faf5b875cad59ca2f31':
  jvdec: use the AVFrame API properly.

Conflicts:
	libavcodec/jvdec.c

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

1 files changed, 4 insertions, 2 deletions

diff --git a/libavcodec/jvdec.c b/libavcodec/jvdec.c
index 740884ad3b..cad053289a 100644
--- a/libavcodec/jvdec.c
+++ b/libavcodec/jvdec.c
@@ -41,11 +41,13 @@ typedef struct JvContext {
 static av_cold int decode_init(AVCodecContext *avctx)
 {
     JvContext *s = avctx->priv_data;
-    avctx->pix_fmt = AV_PIX_FMT_PAL8;
-    ff_dsputil_init(&s->dsp, avctx);
+
     s->frame = av_frame_alloc();
     if (!s->frame)
         return AVERROR(ENOMEM);
+
+    avctx->pix_fmt = AV_PIX_FMT_PAL8;
+    ff_dsputil_init(&s->dsp, avctx);
     return 0;
 }