From d5343a5005af770b7dfa31e53d41a05041b7f75c Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Tue, 3 Apr 2018 15:27:18 -0300
Subject: [PATCH] avcodec/libaomdec: remove duplicate code
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavcodec/libaomdec.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c
index a9fd6215fcb..fdc53e45209 100644
--- a/libavcodec/libaomdec.c
+++ b/libavcodec/libaomdec.c
@@ -95,17 +95,6 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img)
switch (img->fmt) {
case AOM_IMG_FMT_I420:
- avctx->pix_fmt = AV_PIX_FMT_YUV420P;
- avctx->profile = FF_PROFILE_AV1_MAIN;
- return 0;
- case AOM_IMG_FMT_I422:
- avctx->pix_fmt = AV_PIX_FMT_YUV422P;
- avctx->profile = FF_PROFILE_AV1_PROFESSIONAL;
- return 0;
- case AOM_IMG_FMT_I444:
- avctx->pix_fmt = AV_PIX_FMT_YUV444P;
- avctx->profile = FF_PROFILE_AV1_HIGH;
- return 0;
case AOM_IMG_FMT_I42016:
if (img->bit_depth == 8) {
avctx->pix_fmt = AV_PIX_FMT_YUV420P;
@@ -122,6 +111,7 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img)
} else {
return AVERROR_INVALIDDATA;
}
+ case AOM_IMG_FMT_I422:
case AOM_IMG_FMT_I42216:
if (img->bit_depth == 8) {
avctx->pix_fmt = AV_PIX_FMT_YUV422P;
@@ -138,6 +128,7 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img)
} else {
return AVERROR_INVALIDDATA;
}
+ case AOM_IMG_FMT_I444:
case AOM_IMG_FMT_I44416:
if (img->bit_depth == 8) {
avctx->pix_fmt = AV_PIX_FMT_YUV444P;
--
GitLab