[FFmpeg-cvslog] libopenjpegenc: merge common code

Paul B Mahol git at videolan.org
Mon Mar 26 05:45:01 CEST 2012


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sun Mar 25 23:33:52 2012 +0000| [dec8eb6b29beb472e94e7e32ad89e180597b7b0d] | committer: Michael Niedermayer

libopenjpegenc: merge common code

Signed-off-by: Paul B Mahol <onemda at gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw at sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/libopenjpegenc.c |   24 ------------------------
 1 files changed, 0 insertions(+), 24 deletions(-)

diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c
index db25489..8eba40d 100644
--- a/libavcodec/libopenjpegenc.c
+++ b/libavcodec/libopenjpegenc.c
@@ -68,51 +68,27 @@ static opj_image_t *mj2_create_image(AVCodecContext *avctx, opj_cparameters_t *p
 
     switch (avctx->pix_fmt) {
     case PIX_FMT_GRAY8:
-        color_space = CLRSPC_GRAY;
-        break;
     case PIX_FMT_GRAY8A:
-        color_space = CLRSPC_GRAY;
-        break;
     case PIX_FMT_GRAY16:
         color_space = CLRSPC_GRAY;
         break;
     case PIX_FMT_RGB24:
-        color_space = CLRSPC_SRGB;
-        break;
     case PIX_FMT_RGBA:
-        color_space = CLRSPC_SRGB;
-        break;
     case PIX_FMT_RGB48:
-        color_space = CLRSPC_SRGB;
-        break;
     case PIX_FMT_RGBA64:
         color_space = CLRSPC_SRGB;
         break;
     case PIX_FMT_YUV420P:
-        color_space = CLRSPC_SYCC;
-        break;
     case PIX_FMT_YUV422P:
-        color_space = CLRSPC_SYCC;
-        break;
     case PIX_FMT_YUV440P:
-        color_space = CLRSPC_SYCC;
-        break;
     case PIX_FMT_YUV444P:
-        color_space = CLRSPC_SYCC;
-        break;
     case PIX_FMT_YUVA420P:
-        color_space = CLRSPC_SYCC;
-        break;
     case PIX_FMT_YUV420P9:
     case PIX_FMT_YUV422P9:
     case PIX_FMT_YUV444P9:
-        color_space = CLRSPC_SYCC;
-        break;
     case PIX_FMT_YUV420P10:
     case PIX_FMT_YUV422P10:
     case PIX_FMT_YUV444P10:
-        color_space = CLRSPC_SYCC;
-        break;
     case PIX_FMT_YUV420P16:
     case PIX_FMT_YUV422P16:
     case PIX_FMT_YUV444P16:



More information about the ffmpeg-cvslog mailing list