Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 02:56:43 +0000 (03:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 02:56:43 +0000 (03:56 +0100)
* qatar/master:
  lavc: drop ff_pixfmt_list_420

Conflicts:
libavcodec/flvdec.c
libavcodec/msmpeg4dec.c
libavcodec/rv10.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/flvdec.c
libavcodec/intelh263dec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/msmpeg4dec.c
libavcodec/rv10.c
libavcodec/rv30.c
libavcodec/rv40.c
libavcodec/vc1dec.c
libavcodec/wmv2dec.c

@@@ -131,6 -129,8 +131,9 @@@ AVCodec ff_flv_decoder = 
      .close          = ff_h263_decode_end,
      .decode         = ff_h263_decode_frame,
      .capabilities   = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
-     .pix_fmts       = ff_pixfmt_list_420,
 +    .max_lowres     = 3,
+     .pix_fmts       = (const enum AVPixelFormat[]) {
+         AV_PIX_FMT_YUV420P,
+         AV_PIX_FMT_NONE
+     },
  };
Simple merge
Simple merge
Simple merge
@@@ -922,8 -911,10 +922,11 @@@ AVCodec ff_msmpeg4v1_decoder = 
      .close          = ff_h263_decode_end,
      .decode         = ff_h263_decode_frame,
      .capabilities   = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
-     .pix_fmts       = ff_pixfmt_list_420,
 +    .max_lowres     = 3,
+     .pix_fmts       = (const enum AVPixelFormat[]) {
+         AV_PIX_FMT_YUV420P,
+         AV_PIX_FMT_NONE
+     },
  };
  
  AVCodec ff_msmpeg4v2_decoder = {
      .close          = ff_h263_decode_end,
      .decode         = ff_h263_decode_frame,
      .capabilities   = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
-     .pix_fmts       = ff_pixfmt_list_420,
 +    .max_lowres     = 3,
+     .pix_fmts       = (const enum AVPixelFormat[]) {
+         AV_PIX_FMT_YUV420P,
+         AV_PIX_FMT_NONE
+     },
  };
  
  AVCodec ff_msmpeg4v3_decoder = {
      .close          = ff_h263_decode_end,
      .decode         = ff_h263_decode_frame,
      .capabilities   = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
-     .pix_fmts       = ff_pixfmt_list_420,
 +    .max_lowres     = 3,
+     .pix_fmts       = (const enum AVPixelFormat[]) {
+         AV_PIX_FMT_YUV420P,
+         AV_PIX_FMT_NONE
+     },
  };
  
  AVCodec ff_wmv1_decoder = {
      .close          = ff_h263_decode_end,
      .decode         = ff_h263_decode_frame,
      .capabilities   = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
-     .pix_fmts       = ff_pixfmt_list_420,
 +    .max_lowres     = 3,
+     .pix_fmts       = (const enum AVPixelFormat[]) {
+         AV_PIX_FMT_YUV420P,
+         AV_PIX_FMT_NONE
+     },
  };
@@@ -794,8 -769,10 +794,11 @@@ AVCodec ff_rv10_decoder = 
      .close          = rv10_decode_end,
      .decode         = rv10_decode_frame,
      .capabilities   = CODEC_CAP_DR1,
-     .pix_fmts       = ff_pixfmt_list_420,
 +    .max_lowres     = 3,
+     .pix_fmts       = (const enum AVPixelFormat[]) {
+         AV_PIX_FMT_YUV420P,
+         AV_PIX_FMT_NONE
+     },
  };
  
  AVCodec ff_rv20_decoder = {
      .decode         = rv10_decode_frame,
      .capabilities   = CODEC_CAP_DR1 | CODEC_CAP_DELAY,
      .flush          = ff_mpeg_flush,
-     .pix_fmts       = ff_pixfmt_list_420,
 +    .max_lowres     = 3,
+     .pix_fmts       = (const enum AVPixelFormat[]) {
+         AV_PIX_FMT_YUV420P,
+         AV_PIX_FMT_NONE
+     },
  };
Simple merge
Simple merge
Simple merge
Simple merge