Skip to content

F
ffmpeg.wasm-core
Commit f2f711cd authored by Paul B Mahol's avatar Paul B Mahol
Browse files
Options

pcx: read sample aspect ratio 

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent 92b3d8bc
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
libavcodec/pcx.c
View file @ f2f711cd
...@@ -102,6 +102,8 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size, ...@@ -102,6 +102,8 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
ymin = bytestream2_get_le16u(&gb); ymin = bytestream2_get_le16u(&gb);
xmax = bytestream2_get_le16u(&gb); xmax = bytestream2_get_le16u(&gb);
ymax = bytestream2_get_le16u(&gb); ymax = bytestream2_get_le16u(&gb);
avctx->sample_aspect_ratio.num = bytestream2_get_le16u(&gb);
avctx->sample_aspect_ratio.den = bytestream2_get_le16u(&gb);
if (xmax < xmin || ymax < ymin) { if (xmax < xmin || ymax < ymin) {
av_log(avctx, AV_LOG_ERROR, "invalid image dimensions\n"); av_log(avctx, AV_LOG_ERROR, "invalid image dimensions\n");
...@@ -111,7 +113,7 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size, ...@@ -111,7 +113,7 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
w = xmax - xmin + 1; w = xmax - xmin + 1;
h = ymax - ymin + 1; h = ymax - ymin + 1;
bytestream2_skipu(&gb, 53); bytestream2_skipu(&gb, 49);
nplanes = bytestream2_get_byteu(&gb); nplanes = bytestream2_get_byteu(&gb);
bytes_per_line = bytestream2_get_le16u(&gb); bytes_per_line = bytestream2_get_le16u(&gb);
bytes_per_scanline = nplanes * bytes_per_line; bytes_per_scanline = nplanes * bytes_per_line;
......
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