[FFmpeg-cvslog] avcodec/libaomdec: remove duplicate code

James Almer git at videolan.org
Tue Apr 3 21:45:29 EEST 2018


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Apr  3 15:27:18 2018 -0300| [d5343a5005af770b7dfa31e53d41a05041b7f75c] | committer: James Almer

avcodec/libaomdec: remove duplicate code

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5343a5005af770b7dfa31e53d41a05041b7f75c
---

 libavcodec/libaomdec.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c
index a9fd6215fc..fdc53e4520 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;



More information about the ffmpeg-cvslog mailing list