virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

avcodec/libaomdec: fix broken pix_fmt changes from the previous commit

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2018-04-04 01:47:12 -03:00
parent a866cc3ad3
commit 2accdd3871
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/libaomdec.c
View File

@ -103,11 +103,13 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img)
avctx->profile = FF_PROFILE_AV1_MAIN; avctx->profile = FF_PROFILE_AV1_MAIN;
return 0; return 0;
} else if (img->bit_depth == 10) { } else if (img->bit_depth == 10) {
avctx->pix_fmt = AV_PIX_FMT_YUV420P10; avctx->pix_fmt = img->monochrome ?
AV_PIX_FMT_GRAY10 : AV_PIX_FMT_YUV420P10;
avctx->profile = FF_PROFILE_AV1_MAIN; avctx->profile = FF_PROFILE_AV1_MAIN;
return 0; return 0;
} else if (img->bit_depth == 12) { } else if (img->bit_depth == 12) {
avctx->pix_fmt = AV_PIX_FMT_YUV420P12; avctx->pix_fmt = img->monochrome ?
AV_PIX_FMT_GRAY12 : AV_PIX_FMT_YUV420P12;
avctx->profile = FF_PROFILE_AV1_PROFESSIONAL; avctx->profile = FF_PROFILE_AV1_PROFESSIONAL;
return 0; return 0;
} else { } else {
@ -116,8 +118,7 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img)
case AOM_IMG_FMT_I422: case AOM_IMG_FMT_I422:
case AOM_IMG_FMT_I42216: case AOM_IMG_FMT_I42216:
if (img->bit_depth == 8) { if (img->bit_depth == 8) {
avctx->pix_fmt = img->monochrome ? avctx->pix_fmt = AV_PIX_FMT_YUV422P;
AV_PIX_FMT_GRAY10 : AV_PIX_FMT_YUV420P10;
avctx->profile = FF_PROFILE_AV1_PROFESSIONAL; avctx->profile = FF_PROFILE_AV1_PROFESSIONAL;
return 0; return 0;
} else if (img->bit_depth == 10) { } else if (img->bit_depth == 10) {
@ -134,8 +135,7 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img)
case AOM_IMG_FMT_I444: case AOM_IMG_FMT_I444:
case AOM_IMG_FMT_I44416: case AOM_IMG_FMT_I44416:
if (img->bit_depth == 8) { if (img->bit_depth == 8) {
avctx->pix_fmt = img->monochrome ? avctx->pix_fmt = AV_PIX_FMT_YUV444P;
AV_PIX_FMT_GRAY12 : AV_PIX_FMT_YUV420P12;
avctx->profile = FF_PROFILE_AV1_HIGH; avctx->profile = FF_PROFILE_AV1_HIGH;
return 0; return 0;
} else if (img->bit_depth == 10) { } else if (img->bit_depth == 10) {