Merge commit '5b4dfbffc258f90a7d2540d21209ac23afcf7cd0'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jan 2013 00:35:12 +0000 (01:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jan 2013 00:35:18 +0000 (01:35 +0100)
* commit '5b4dfbffc258f90a7d2540d21209ac23afcf7cd0':
  x86: ABS1: port to cpuflags
  v210x: cosmetics, reformat

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/v210x.c
libavcodec/x86/dsputilenc.asm
libavutil/x86/x86util.asm

@@@ -30,12 -30,10 +30,12 @@@ static av_cold int decode_init(AVCodecC
          av_log(avctx, AV_LOG_ERROR, "v210x needs even width\n");
          return AVERROR(EINVAL);
      }
-     avctx->pix_fmt = AV_PIX_FMT_YUV422P16;
-     avctx->bits_per_raw_sample= 10;
+     avctx->pix_fmt             = AV_PIX_FMT_YUV422P16;
+     avctx->bits_per_raw_sample = 10;
  
      avctx->coded_frame= avcodec_alloc_frame();
 +    if (!avctx->coded_frame)
 +        return AVERROR(ENOMEM);
  
      return 0;
  }
Simple merge
Simple merge