Commit 1f2f031c authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

Set bits_per_raw_sample when decoding libopenjpeg images.

Reviewed-by: Michael Bradshaw
parent 1337c6cf
...@@ -229,6 +229,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, ...@@ -229,6 +229,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
int width, height, ret = -1; int width, height, ret = -1;
int pixel_size = 0; int pixel_size = 0;
int ispacked = 0; int ispacked = 0;
int i;
*data_size = 0; *data_size = 0;
...@@ -291,6 +292,9 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, ...@@ -291,6 +292,9 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "Unable to determine pixel format\n"); av_log(avctx, AV_LOG_ERROR, "Unable to determine pixel format\n");
goto done; 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]) if(picture->data[0])
ff_thread_release_buffer(avctx, picture); ff_thread_release_buffer(avctx, picture);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment