Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
f2f711cd
Commit
f2f711cd
authored
Oct 11, 2012
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pcx: read sample aspect ratio
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
92b3d8bc
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
pcx.c
libavcodec/pcx.c
+3
-1
No files found.
libavcodec/pcx.c
View file @
f2f711cd
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment