if(s->rgb){
s->avctx->pix_fmt = PIX_FMT_BGRA;
}else{
+ if(s->component_id[0] == 'Q' && s->component_id[1] == 'F' && s->component_id[2] == 'A'){
+ s->avctx->pix_fmt = PIX_FMT_GBR24P;
+ }else{
s->avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV444P : PIX_FMT_YUVJ444P;
s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG;
+ }
}
assert(s->nb_components==3);
break;
&& nb_components == 3 && s->nb_components == 3 && i)
index = 3 - i;
+ if(nb_components == 3 && s->nb_components == 3 && s->avctx->pix_fmt == PIX_FMT_GBR24P)
+ index = (i+2)%3;
+
s->comp_index[i] = index;
s->nb_blocks[i] = s->h_count[index] * s->v_count[index];
break;
}
if (ff_mjpeg_decode_sos(s, NULL, NULL) < 0 &&
- avctx->error_recognition >= FF_ER_EXPLODE)
+ (avctx->err_recognition & AV_EF_EXPLODE))
return AVERROR_INVALIDDATA;
break;
case DRI: