diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 22:26:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 22:32:13 +0200 |
| commit | 2f5bf2f7f20f29bad8c459824eaf33f2e0e483b5 (patch) | |
| tree | 43caa8bdcf7a5d885b81a37755ded859ec7cad17 /libswscale/utils.c | |
| parent | 6017c98036078283ce3bf4069227fed13f3e0cc0 (diff) | |
| parent | f84a1b597c29dc035b8d5529ef88c2d7ff057820 (diff) | |
Merge commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820'
* commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820':
swscale: support AV_PIX_FMT_YA16 as input
Conflicts:
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/utils.c')
| -rw-r--r-- | libswscale/utils.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c index 22965310da..4f3ce27878 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -162,6 +162,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_BGR444LE] = { 1, 1 }, [AV_PIX_FMT_BGR444BE] = { 1, 1 }, [AV_PIX_FMT_YA8] = { 1, 0 }, + [AV_PIX_FMT_YA16BE] = { 1, 0 }, + [AV_PIX_FMT_YA16LE] = { 1, 0 }, [AV_PIX_FMT_BGR48BE] = { 1, 1 }, [AV_PIX_FMT_BGR48LE] = { 1, 1 }, [AV_PIX_FMT_BGRA64BE] = { 1, 1, 1 }, |