Commit d391feff authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

lavc/v210dec: Allow odd width.

The rightmost column is not decoded correctly.

Fixes a part of ticket #5195.
parent 0275b2d9
...@@ -53,10 +53,6 @@ static av_cold int decode_init(AVCodecContext *avctx) ...@@ -53,10 +53,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
{ {
V210DecContext *s = avctx->priv_data; V210DecContext *s = avctx->priv_data;
if (avctx->width & 1) {
av_log(avctx, AV_LOG_ERROR, "v210 needs even width\n");
return AVERROR_INVALIDDATA;
}
avctx->pix_fmt = AV_PIX_FMT_YUV422P10; avctx->pix_fmt = AV_PIX_FMT_YUV422P10;
avctx->bits_per_raw_sample = 10; avctx->bits_per_raw_sample = 10;
...@@ -141,7 +137,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, ...@@ -141,7 +137,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
} }
psrc += stride; psrc += stride;
y += pic->linesize[0] / 2 - avctx->width; y += pic->linesize[0] / 2 - avctx->width + (avctx->width & 1);
u += pic->linesize[1] / 2 - avctx->width / 2; u += pic->linesize[1] / 2 - avctx->width / 2;
v += pic->linesize[2] / 2 - avctx->width / 2; v += pic->linesize[2] / 2 - avctx->width / 2;
} }
......
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