Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'

[ffmpeg] / libavcodec / pcx.c

diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c
index 06f0f0fb55cb79dfc5c8b2061b686f0ac25f3789..722e89ff96b1b25ee67d94aa5921095d6769f92f 100644 (file)
--- a/libavcodec/pcx.c
+++ b/libavcodec/pcx.c
@@ -102,6 +102,8 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     ymin = bytestream2_get_le16u(&gb);
     xmax = 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) {
         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,
     w = xmax - xmin + 1;
     h = ymax - ymin + 1;
 
-    bytestream2_skipu(&gb, 53);
+    bytestream2_skipu(&gb, 49);
     nplanes            = bytestream2_get_byteu(&gb);
     bytes_per_line     = bytestream2_get_le16u(&gb);
     bytes_per_scanline = nplanes * bytes_per_line;