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
2dd7b461
Commit
2dd7b461
authored
Apr 07, 2016
by
Martin Vignali
Committed by
Paul B Mahol
Apr 10, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/exr: fix channel detection
parent
7e1e25c2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
8 deletions
+10
-8
exr.c
libavcodec/exr.c
+10
-8
No files found.
libavcodec/exr.c
View file @
2dd7b461
...
...
@@ -1382,15 +1382,17 @@ static int decode_header(EXRContext *s)
return
AVERROR_PATCHWELCOME
;
}
if
(
channel_index
>=
0
)
{
if
(
s
->
pixel_type
!=
EXR_UNKNOWN
&&
s
->
pixel_type
!=
current_pixel_type
)
{
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"RGB channels not of the same depth.
\n
"
);
return
AVERROR_INVALIDDATA
;
if
(
s
->
channel_offsets
[
channel_index
]
==
-
1
){
/* channel have not been previously assign */
if
(
channel_index
>=
0
)
{
if
(
s
->
pixel_type
!=
EXR_UNKNOWN
&&
s
->
pixel_type
!=
current_pixel_type
)
{
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"RGB channels not of the same depth.
\n
"
);
return
AVERROR_INVALIDDATA
;
}
s
->
pixel_type
=
current_pixel_type
;
s
->
channel_offsets
[
channel_index
]
=
s
->
current_channel_offset
;
}
s
->
pixel_type
=
current_pixel_type
;
s
->
channel_offsets
[
channel_index
]
=
s
->
current_channel_offset
;
}
s
->
channels
=
av_realloc
(
s
->
channels
,
...
...
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