diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 07:35:00 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 07:45:48 +0300 |
| commit | 5edbd4f4106fcff571c3f2c5a1f89534b5bd0307 (patch) | |
| tree | 712e4de8911f2bbdbe54578f8b69db52d739818e /libavcodec | |
| parent | ada0fc4efa2502c901310faef6b63349e8b6bd6a (diff) | |
| parent | 9a4aaae3b29392b6d74997e06be249d7d54a7394 (diff) | |
Merge commit '9a4aaae3b29392b6d74997e06be249d7d54a7394'
* commit '9a4aaae3b29392b6d74997e06be249d7d54a7394':
lavc: add GBRAP to avcodec_align_dimensions2
See: 5c057433ccd32f37ddc828d3f82c5b1ad7d3e3db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 1ec5caed82..e18ed2d751 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -297,8 +297,8 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, case AV_PIX_FMT_YUV422P: case AV_PIX_FMT_YUV440P: case AV_PIX_FMT_YUV444P: - case AV_PIX_FMT_GBRAP: case AV_PIX_FMT_GBRP: + case AV_PIX_FMT_GBRAP: case AV_PIX_FMT_GRAY8: case AV_PIX_FMT_GRAY16BE: case AV_PIX_FMT_GRAY16LE: |