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
2bae3da7
Commit
2bae3da7
authored
Jan 22, 2020
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/exr: fix some small cosmetics nits
parent
44b1c5dd
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
exr.c
libavcodec/exr.c
+5
-5
No files found.
libavcodec/exr.c
View file @
2bae3da7
...
@@ -1183,7 +1183,7 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
...
@@ -1183,7 +1183,7 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
const
uint8_t
*
a
;
const
uint8_t
*
a
;
const
uint8_t
*
rgb
[
3
];
const
uint8_t
*
rgb
[
3
];
for
(
c
=
0
;
c
<
rgb_channel_count
;
c
++
){
for
(
c
=
0
;
c
<
rgb_channel_count
;
c
++
)
{
rgb
[
c
]
=
channel_buffer
[
c
];
rgb
[
c
]
=
channel_buffer
[
c
];
}
}
...
@@ -1414,8 +1414,8 @@ static int decode_header(EXRContext *s, AVFrame *frame)
...
@@ -1414,8 +1414,8 @@ static int decode_header(EXRContext *s, AVFrame *frame)
s
->
is_luma
=
1
;
s
->
is_luma
=
1
;
}
else
if
(
!
av_strcasecmp
(
ch_gb
.
buffer
,
"B"
)
||
}
else
if
(
!
av_strcasecmp
(
ch_gb
.
buffer
,
"B"
)
||
!
av_strcasecmp
(
ch_gb
.
buffer
,
"Z"
)
||
!
av_strcasecmp
(
ch_gb
.
buffer
,
"Z"
)
||
!
av_strcasecmp
(
ch_gb
.
buffer
,
"W"
)){
!
av_strcasecmp
(
ch_gb
.
buffer
,
"W"
))
{
channel_index
=
2
;
channel_index
=
2
;
s
->
is_luma
=
0
;
s
->
is_luma
=
0
;
}
else
if
(
!
av_strcasecmp
(
ch_gb
.
buffer
,
"A"
))
{
}
else
if
(
!
av_strcasecmp
(
ch_gb
.
buffer
,
"A"
))
{
channel_index
=
3
;
channel_index
=
3
;
...
@@ -1495,7 +1495,7 @@ static int decode_header(EXRContext *s, AVFrame *frame)
...
@@ -1495,7 +1495,7 @@ static int decode_header(EXRContext *s, AVFrame *frame)
/* Check if all channels are set with an offset or if the channels
/* Check if all channels are set with an offset or if the channels
* are causing an overflow */
* are causing an overflow */
if
(
!
s
->
is_luma
){
/* if we expected to have at least 3 channels */
if
(
!
s
->
is_luma
)
{
/* if we expected to have at least 3 channels */
if
(
FFMIN3
(
s
->
channel_offsets
[
0
],
if
(
FFMIN3
(
s
->
channel_offsets
[
0
],
s
->
channel_offsets
[
1
],
s
->
channel_offsets
[
1
],
s
->
channel_offsets
[
2
])
<
0
)
{
s
->
channel_offsets
[
2
])
<
0
)
{
...
@@ -1596,7 +1596,7 @@ static int decode_header(EXRContext *s, AVFrame *frame)
...
@@ -1596,7 +1596,7 @@ static int decode_header(EXRContext *s, AVFrame *frame)
s
->
tile_attr
.
level_mode
=
tileLevel
&
0x0f
;
s
->
tile_attr
.
level_mode
=
tileLevel
&
0x0f
;
s
->
tile_attr
.
level_round
=
(
tileLevel
>>
4
)
&
0x0f
;
s
->
tile_attr
.
level_round
=
(
tileLevel
>>
4
)
&
0x0f
;
if
(
s
->
tile_attr
.
level_mode
>=
EXR_TILE_LEVEL_UNKNOWN
){
if
(
s
->
tile_attr
.
level_mode
>=
EXR_TILE_LEVEL_UNKNOWN
)
{
avpriv_report_missing_feature
(
s
->
avctx
,
"Tile level mode %d"
,
avpriv_report_missing_feature
(
s
->
avctx
,
"Tile level mode %d"
,
s
->
tile_attr
.
level_mode
);
s
->
tile_attr
.
level_mode
);
ret
=
AVERROR_PATCHWELCOME
;
ret
=
AVERROR_PATCHWELCOME
;
...
...
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