diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 15:17:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 15:17:34 +0100 |
| commit | 4e276b84e697ec9c21cec1fb0a4b2ad7e8cbf4ed (patch) | |
| tree | eca61ff6a87c57b533b8134d66a0e7be5ea6591a | |
| parent | b7697d29ed772dd94cb23400154d3e47e326d151 (diff) | |
| parent | 8058284ce09030b47512746d726fb2ad3ae8a20f (diff) | |
| download | ffmpeg-4e276b84e697ec9c21cec1fb0a4b2ad7e8cbf4ed.tar.gz | |
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>
| -rw-r--r-- | libavcodec/utils.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 2c27e19534..023ea1d557 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -314,6 +314,12 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, 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: @@ -324,6 +330,12 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, 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: @@ -334,18 +346,6 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, case AV_PIX_FMT_YUV444P14BE: case AV_PIX_FMT_YUV444P16LE: case AV_PIX_FMT_YUV444P16BE: - 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_YUVA444P9LE: case AV_PIX_FMT_YUVA444P9BE: case AV_PIX_FMT_YUVA444P10LE: |