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
7b9fc769
Commit
7b9fc769
authored
Oct 14, 2012
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
svq1dec: use more common way to check if result is not zero
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
8f4020d8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
18 deletions
+10
-18
svq1dec.c
libavcodec/svq1dec.c
+10
-18
No files found.
libavcodec/svq1dec.c
View file @
7b9fc769
...
...
@@ -333,8 +333,7 @@ static int svq1_motion_inter_block(MpegEncContext *s, GetBitContext *bitbuf,
}
result
=
svq1_decode_motion_vector
(
bitbuf
,
&
mv
,
pmv
);
if
(
result
!=
0
)
if
(
result
)
return
result
;
motion
[
0
].
x
=
...
...
@@ -378,8 +377,7 @@ static int svq1_motion_inter_4v_block(MpegEncContext *s, GetBitContext *bitbuf,
}
result
=
svq1_decode_motion_vector
(
bitbuf
,
&
mv
,
pmv
);
if
(
result
!=
0
)
if
(
result
)
return
result
;
/* predict and decode motion vector (1) */
...
...
@@ -391,8 +389,7 @@ static int svq1_motion_inter_4v_block(MpegEncContext *s, GetBitContext *bitbuf,
pmv
[
1
]
=
&
motion
[(
x
/
8
)
+
3
];
}
result
=
svq1_decode_motion_vector
(
bitbuf
,
&
motion
[
0
],
pmv
);
if
(
result
!=
0
)
if
(
result
)
return
result
;
/* predict and decode motion vector (2) */
...
...
@@ -400,8 +397,7 @@ static int svq1_motion_inter_4v_block(MpegEncContext *s, GetBitContext *bitbuf,
pmv
[
2
]
=
&
motion
[(
x
/
8
)
+
1
];
result
=
svq1_decode_motion_vector
(
bitbuf
,
&
motion
[(
x
/
8
)
+
2
],
pmv
);
if
(
result
!=
0
)
if
(
result
)
return
result
;
/* predict and decode motion vector (3) */
...
...
@@ -409,8 +405,7 @@ static int svq1_motion_inter_4v_block(MpegEncContext *s, GetBitContext *bitbuf,
pmv
[
3
]
=
&
motion
[(
x
/
8
)
+
3
];
result
=
svq1_decode_motion_vector
(
bitbuf
,
pmv
[
3
],
pmv
);
if
(
result
!=
0
)
if
(
result
)
return
result
;
/* form predictions */
...
...
@@ -467,8 +462,7 @@ static int svq1_decode_delta_block(MpegEncContext *s, GetBitContext *bitbuf,
case
SVQ1_BLOCK_INTER
:
result
=
svq1_motion_inter_block
(
s
,
bitbuf
,
current
,
previous
,
pitch
,
motion
,
x
,
y
);
if
(
result
!=
0
)
{
if
(
result
)
{
av_dlog
(
s
->
avctx
,
"Error in svq1_motion_inter_block %i
\n
"
,
result
);
break
;
}
...
...
@@ -478,8 +472,7 @@ static int svq1_decode_delta_block(MpegEncContext *s, GetBitContext *bitbuf,
case
SVQ1_BLOCK_INTER_4V
:
result
=
svq1_motion_inter_4v_block
(
s
,
bitbuf
,
current
,
previous
,
pitch
,
motion
,
x
,
y
);
if
(
result
!=
0
)
{
if
(
result
)
{
av_dlog
(
s
->
avctx
,
"Error in svq1_motion_inter_4v_block %i
\n
"
,
result
);
break
;
...
...
@@ -617,8 +610,7 @@ static int svq1_decode_frame(AVCodecContext *avctx, void *data,
}
result
=
svq1_decode_frame_header
(
&
s
->
gb
,
s
);
if
(
result
!=
0
)
{
if
(
result
)
{
av_dlog
(
s
->
avctx
,
"Error in svq1_decode_frame_header %i
\n
"
,
result
);
return
result
;
}
...
...
@@ -672,7 +664,7 @@ static int svq1_decode_frame(AVCodecContext *avctx, void *data,
for
(
x
=
0
;
x
<
width
;
x
+=
16
)
{
result
=
svq1_decode_block_intra
(
&
s
->
gb
,
&
current
[
x
],
linesize
);
if
(
result
!=
0
)
{
if
(
result
)
{
av_log
(
s
->
avctx
,
AV_LOG_INFO
,
"Error in svq1_decode_block %i (keyframe)
\n
"
,
result
);
...
...
@@ -690,7 +682,7 @@ static int svq1_decode_frame(AVCodecContext *avctx, void *data,
result
=
svq1_decode_delta_block
(
s
,
&
s
->
gb
,
&
current
[
x
],
previous
,
linesize
,
pmv
,
x
,
y
);
if
(
result
!=
0
)
{
if
(
result
)
{
av_dlog
(
s
->
avctx
,
"Error in svq1_decode_delta_block %i
\n
"
,
result
);
...
...
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