[FFmpeg-cvslog] Set bits_per_raw_sample when decoding libopenjpeg images.

Carl Eugen Hoyos git at videolan.org
Sun May 13 16:46:34 CEST 2012


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sun May 13 16:45:31 2012 +0200| [1f2f031c2fc3a0f5439a2f3fb22236c8e3d8f69f] | committer: Carl Eugen Hoyos

Set bits_per_raw_sample when decoding libopenjpeg images.

Reviewed-by: Michael Bradshaw

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

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

diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c
index 008d8ba..9928adb 100644
--- a/libavcodec/libopenjpegdec.c
+++ b/libavcodec/libopenjpegdec.c
@@ -229,6 +229,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
     int width, height, ret = -1;
     int pixel_size = 0;
     int ispacked = 0;
+    int i;
 
     *data_size = 0;
 
@@ -291,6 +292,9 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
         av_log(avctx, AV_LOG_ERROR, "Unable to determine pixel format\n");
         goto done;
     }
+    for (i = 0; i < image->numcomps; i++)
+        if (image->comps[i].prec > avctx->bits_per_raw_sample)
+            avctx->bits_per_raw_sample = image->comps[i].prec;
 
     if(picture->data[0])
         ff_thread_release_buffer(avctx, picture);



More information about the ffmpeg-cvslog mailing list