Merge commit '1df0b061621b10edde87e3ab7ea83aed381c574f'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 20:58:04 +0000 (21:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 20:58:04 +0000 (21:58 +0100)
* commit '1df0b061621b10edde87e3ab7ea83aed381c574f':
  nuv: Reuse the DSPContext from RTJpegContext

Conflicts:
libavcodec/nuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/nuv.c
libavcodec/rtjpeg.c
libavcodec/rtjpeg.h

@@@ -138,14 -133,12 +137,12 @@@ static int codec_reinit(AVCodecContext 
              av_log(avctx, AV_LOG_ERROR,
                     "Can't allocate decompression buffer.\n");
              return AVERROR(ENOMEM);
 -        } else
 -            c->decomp_buf = ptr;
 +        }
-         ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height,
-                               c->lq, c->cq);
+         ff_rtjpeg_decode_init(&c->rtj, 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);
+         ff_rtjpeg_decode_init(&c->rtj, c->width, c->height, c->lq, c->cq);
  
      return 0;
  }
Simple merge
Simple merge