Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
64250d94
Commit
64250d94
authored
Mar 19, 2016
by
Vittorio Giovara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
indeo4: Consistently initialize variables
Avoid using multiple variables for the same purpose.
parent
6202e2fe
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
8 deletions
+4
-8
indeo4.c
libavcodec/indeo4.c
+3
-6
ivi.h
libavcodec/ivi.h
+1
-2
No files found.
libavcodec/indeo4.c
View file @
64250d94
...
...
@@ -122,10 +122,7 @@ static int decode_pic_hdr(IVI45DecContext *ctx, AVCodecContext *avctx)
if
(
ctx
->
frame_type
==
IVI4_FRAMETYPE_BIDIR
)
ctx
->
has_b_frames
=
1
;
ctx
->
transp_status
=
get_bits1
(
&
ctx
->
gb
);
if
(
ctx
->
transp_status
)
{
ctx
->
has_transp
=
1
;
}
ctx
->
has_transp
=
get_bits1
(
&
ctx
->
gb
);
/* unknown bit: Mac decoder ignores this bit, XANIM returns error */
if
(
get_bits1
(
&
ctx
->
gb
))
{
...
...
@@ -159,10 +156,10 @@ static int decode_pic_hdr(IVI45DecContext *ctx, AVCodecContext *avctx)
}
/* Decode tile dimensions. */
if
(
get_bits1
(
&
ctx
->
gb
))
{
ctx
->
uses_tiling
=
get_bits1
(
&
ctx
->
gb
);
if
(
ctx
->
uses_tiling
)
{
pic_conf
.
tile_height
=
scale_tile_size
(
pic_conf
.
pic_height
,
get_bits
(
&
ctx
->
gb
,
4
));
pic_conf
.
tile_width
=
scale_tile_size
(
pic_conf
.
pic_width
,
get_bits
(
&
ctx
->
gb
,
4
));
ctx
->
uses_tiling
=
1
;
}
else
{
pic_conf
.
tile_height
=
pic_conf
.
pic_height
;
pic_conf
.
tile_width
=
pic_conf
.
pic_width
;
...
...
libavcodec/ivi.h
View file @
64250d94
...
...
@@ -218,7 +218,6 @@ typedef struct IVI45DecContext {
int
prev_frame_type
;
///< frame type of the previous frame
uint32_t
data_size
;
///< size of the frame data in bytes from picture header
int
is_scalable
;
int
transp_status
;
///< transparency mode status: 1 - enabled
const
uint8_t
*
frame_data
;
///< input frame data pointer
int
inter_scal
;
///< signals a sequence of scalable inter frames
uint32_t
frame_size
;
///< frame size in bytes
...
...
@@ -250,7 +249,7 @@ typedef struct IVI45DecContext {
int
show_indeo4_info
;
uint8_t
has_b_frames
;
uint8_t
has_transp
;
uint8_t
has_transp
;
///< transparency mode status: 1 - enabled
uint8_t
uses_tiling
;
uint8_t
uses_haar
;
uint8_t
uses_fullpel
;
...
...
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