Commit 2a9c5079 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/huffyuv: dont depend on bitstream_bpp having a specific value for version>2

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent c94ed2a7
...@@ -58,7 +58,7 @@ av_cold int ff_huffyuv_alloc_temp(HYuvContext *s) ...@@ -58,7 +58,7 @@ av_cold int ff_huffyuv_alloc_temp(HYuvContext *s)
{ {
int i; int i;
if (s->bitstream_bpp<24) { if (s->bitstream_bpp<24 || s->version > 2) {
for (i=0; i<3; i++) { for (i=0; i<3; i++) {
s->temp[i]= av_malloc(2*s->width + 16); s->temp[i]= av_malloc(2*s->width + 16);
if (!s->temp[i]) if (!s->temp[i])
......
...@@ -349,7 +349,7 @@ static av_cold int encode_init(AVCodecContext *avctx) ...@@ -349,7 +349,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (s->bitstream_bpp >= 24 && s->predictor == MEDIAN) { if (s->bitstream_bpp >= 24 && s->predictor == MEDIAN && s->version <= 2) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Error: RGB is incompatible with median predictor\n"); "Error: RGB is incompatible with median predictor\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
......
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