oMerge commit '85ac12587bfef970d0e0e4abc292df346daf8478'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Sep 2013 09:40:45 +0000 (11:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Sep 2013 09:40:45 +0000 (11:40 +0200)
* commit '85ac12587bfef970d0e0e4abc292df346daf8478':
  nuv: check ff_rtjpeg_decode_frame_yuv420 return value

Conflicts:
libavcodec/nuv.c

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

@@@ -157,8 -153,7 +157,8 @@@ static int decode_frame(AVCodecContext 
      NuvContext *c      = avctx->priv_data;
      AVFrame *picture   = data;
      int orig_size      = buf_size;
-     int keyframe;
+     int keyframe, ret;
 +    int size_change = 0;
      int result, init_frame = !avctx->frame_number;
      enum {
          NUV_UNCOMPRESSED  = '0',