diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 21:48:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 21:48:00 +0200 |
| commit | 4c8bc6fdee95af4cd7a8409dec34756350078b5e (patch) | |
| tree | 06e2f17f1cf3a77a0ec5c0c4ba4e91bf90b52710 /libswscale/input.c | |
| parent | 0b25261d29c6b348e2dccc2985090cf10a60c34f (diff) | |
| parent | e96c3b81cadd0ba84d43b1f3a54980df3785d9a5 (diff) | |
| download | ffmpeg-4c8bc6fdee95af4cd7a8409dec34756350078b5e.tar.gz | |
Merge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5'
* commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5':
avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8
Conflicts:
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/raw.c
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/input.c')
| -rw-r--r-- | libswscale/input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/input.c b/libswscale/input.c index 6a39a3011d..15b0f5da3c 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -1217,7 +1217,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) #endif case AV_PIX_FMT_YUYV422: case AV_PIX_FMT_YVYU422: - case AV_PIX_FMT_Y400A: + case AV_PIX_FMT_YA8: c->lumToYV12 = yuy2ToY_c; break; case AV_PIX_FMT_UYVY422: @@ -1332,7 +1332,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_ARGB: c->alpToYV12 = abgrToA_c; break; - case AV_PIX_FMT_Y400A: + case AV_PIX_FMT_YA8: c->alpToYV12 = uyvyToY_c; break; case AV_PIX_FMT_PAL8 : |