Commit e51cc7ed authored by Zhong Li's avatar Zhong Li

lavc/mjpegdec: make code aligned

Reviewed-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
Signed-off-by: 's avatarZhong Li <zhong.li@intel.com>
parent a6c648f2
...@@ -453,7 +453,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) ...@@ -453,7 +453,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
avpriv_request_sample(s->avctx, "progressively coded interlaced picture"); avpriv_request_sample(s->avctx, "progressively coded interlaced picture");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
} else{ } else {
if (s->v_max == 1 && s->h_max == 1 && s->lossless==1 && (nb_components==3 || nb_components==4)) if (s->v_max == 1 && s->h_max == 1 && s->lossless==1 && (nb_components==3 || nb_components==4))
s->rgb = 1; s->rgb = 1;
else if (!s->lossless) else if (!s->lossless)
...@@ -638,7 +638,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) ...@@ -638,7 +638,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG;
break; break;
default: default:
unk_pixfmt: unk_pixfmt:
avpriv_report_missing_feature(s->avctx, "Pixel format 0x%x bits:%d", pix_fmt_id, s->bits); avpriv_report_missing_feature(s->avctx, "Pixel format 0x%x bits:%d", pix_fmt_id, s->bits);
memset(s->upscale_h, 0, sizeof(s->upscale_h)); memset(s->upscale_h, 0, sizeof(s->upscale_h));
memset(s->upscale_v, 0, sizeof(s->upscale_v)); memset(s->upscale_v, 0, sizeof(s->upscale_v));
......
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