Merge commit '8058284ce09030b47512746d726fb2ad3ae8a20f'

* commit '8058284ce09030b47512746d726fb2ad3ae8a20f':
  lavc: add 422/444 YUV with alpha to align_dimensions()

Conflicts:
	libavcodec/utils.c

Only cosmetical changes happen as these formats already where in the list before

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/utils.c
index 2c27e19,1c56d79..023ea1d
--- 1/libavcodec/utils.c
--- 2/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@@ -308,50 -206,18 +308,50 @@@ void avcodec_align_dimensions2(AVCodecC
      case AV_PIX_FMT_YUV420P9BE:
      case AV_PIX_FMT_YUV420P10LE:
      case AV_PIX_FMT_YUV420P10BE:
 +    case AV_PIX_FMT_YUV420P12LE:
 +    case AV_PIX_FMT_YUV420P12BE:
 +    case AV_PIX_FMT_YUV420P14LE:
 +    case AV_PIX_FMT_YUV420P14BE:
 +    case AV_PIX_FMT_YUV420P16LE:
 +    case AV_PIX_FMT_YUV420P16BE:
++    case AV_PIX_FMT_YUVA420P9LE:
++    case AV_PIX_FMT_YUVA420P9BE:
++    case AV_PIX_FMT_YUVA420P10LE:
++    case AV_PIX_FMT_YUVA420P10BE:
++    case AV_PIX_FMT_YUVA420P16LE:
++    case AV_PIX_FMT_YUVA420P16BE:
      case AV_PIX_FMT_YUV422P9LE:
      case AV_PIX_FMT_YUV422P9BE:
      case AV_PIX_FMT_YUV422P10LE:
      case AV_PIX_FMT_YUV422P10BE:
 +    case AV_PIX_FMT_YUV422P12LE:
 +    case AV_PIX_FMT_YUV422P12BE:
 +    case AV_PIX_FMT_YUV422P14LE:
 +    case AV_PIX_FMT_YUV422P14BE:
 +    case AV_PIX_FMT_YUV422P16LE:
 +    case AV_PIX_FMT_YUV422P16BE:
++    case AV_PIX_FMT_YUVA422P9LE:
++    case AV_PIX_FMT_YUVA422P9BE:
+     case AV_PIX_FMT_YUVA422P10LE:
+     case AV_PIX_FMT_YUVA422P10BE:
++    case AV_PIX_FMT_YUVA422P16LE:
++    case AV_PIX_FMT_YUVA422P16BE:
      case AV_PIX_FMT_YUV444P9LE:
      case AV_PIX_FMT_YUV444P9BE:
      case AV_PIX_FMT_YUV444P10LE:
      case AV_PIX_FMT_YUV444P10BE:
-     case AV_PIX_FMT_YUVA420P9LE:
-     case AV_PIX_FMT_YUVA420P9BE:
-     case AV_PIX_FMT_YUVA420P10LE:
-     case AV_PIX_FMT_YUVA420P10BE:
-     case AV_PIX_FMT_YUVA420P16LE:
-     case AV_PIX_FMT_YUVA420P16BE:
-     case AV_PIX_FMT_YUVA422P9LE:
-     case AV_PIX_FMT_YUVA422P9BE:
-     case AV_PIX_FMT_YUVA422P10LE:
-     case AV_PIX_FMT_YUVA422P10BE:
-     case AV_PIX_FMT_YUVA422P16LE:
-     case AV_PIX_FMT_YUVA422P16BE:
 +    case AV_PIX_FMT_YUV444P12LE:
 +    case AV_PIX_FMT_YUV444P12BE:
 +    case AV_PIX_FMT_YUV444P14LE:
 +    case AV_PIX_FMT_YUV444P14BE:
 +    case AV_PIX_FMT_YUV444P16LE:
 +    case AV_PIX_FMT_YUV444P16BE:
 +    case AV_PIX_FMT_YUVA444P9LE:
 +    case AV_PIX_FMT_YUVA444P9BE:
      case AV_PIX_FMT_YUVA444P10LE:
      case AV_PIX_FMT_YUVA444P10BE:
 +    case AV_PIX_FMT_YUVA444P16LE:
 +    case AV_PIX_FMT_YUVA444P16BE:
      case AV_PIX_FMT_GBRP9LE:
      case AV_PIX_FMT_GBRP9BE:
      case AV_PIX_FMT_GBRP10LE: