Merge remote-tracking branch 'qatar/master'

* 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>

diff --cc libavcodec/flvdec.c
index f425f004243f8fba7534e4d675cf7d1d9845deec,c981e546cfac0e0c71da6b63691590ce2a38a839..ade2f79b6d5c1ecc084c54ed47543377bd0246f9
--- 1/libavcodec/flvdec.c
--- 2/libavcodec/flvdec.c
+++ b/libavcodec/flvdec.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
+     },
  };

diff --cc libavcodec/intelh263dec.c
Simple merge

diff --cc libavcodec/mpegvideo.c
Simple merge

diff --cc libavcodec/mpegvideo.h
Simple merge

diff --cc libavcodec/msmpeg4dec.c
index d8962adca9bc811b035d841737f0e3119a755fca,bf56bcc7e22a1f9b137669784901a50b12816436..52a53dde3fe5d8e05411dec392d7b4e992c561c4
--- 1/libavcodec/msmpeg4dec.c
--- 2/libavcodec/msmpeg4dec.c
+++ b/libavcodec/msmpeg4dec.c
@@@ -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 = {
@@@ -936,8 -927,10 +939,11 @@@
      .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 = {
@@@ -950,8 -943,10 +956,11 @@@
      .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 = {
@@@ -964,6 -959,8 +973,9 @@@
      .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
+     },
  };

diff --cc libavcodec/rv10.c
index 8c14399b178279787cf7e5112cdf0f29ef516dc6,d0e61f008352ca299528bb2d20a54590ce12ff35..334994478ac998531dfe53f7218102f8f896267b
--- 1/libavcodec/rv10.c
--- 2/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@@ -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 = {
@@@ -809,6 -786,8 +812,9 @@@
      .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
+     },
  };

diff --cc libavcodec/rv30.c
Simple merge

diff --cc libavcodec/rv40.c
Simple merge

diff --cc libavcodec/vc1dec.c
Simple merge

diff --cc libavcodec/wmv2dec.c
Simple merge