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
41f97420
Commit
41f97420
authored
Feb 04, 2014
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/vc1dec: vc1_pred_b_mv() is not used for fields, simplify code
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
c93e6913
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
vc1dec.c
libavcodec/vc1dec.c
+2
-2
No files found.
libavcodec/vc1dec.c
View file @
41f97420
...
@@ -2113,6 +2113,8 @@ static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2],
...
@@ -2113,6 +2113,8 @@ static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2],
int
r_x
,
r_y
;
int
r_x
,
r_y
;
const
uint8_t
*
is_intra
=
v
->
mb_type
[
0
];
const
uint8_t
*
is_intra
=
v
->
mb_type
[
0
];
av_assert0
(
!
v
->
field_mode
);
r_x
=
v
->
range_x
;
r_x
=
v
->
range_x
;
r_y
=
v
->
range_y
;
r_y
=
v
->
range_y
;
/* scale MV difference to be quad-pel */
/* scale MV difference to be quad-pel */
...
@@ -2131,7 +2133,6 @@ static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2],
...
@@ -2131,7 +2133,6 @@ static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2],
s
->
current_picture
.
motion_val
[
1
][
xy
+
v
->
blocks_off
][
1
]
=
0
;
s
->
current_picture
.
motion_val
[
1
][
xy
+
v
->
blocks_off
][
1
]
=
0
;
return
;
return
;
}
}
if
(
!
v
->
field_mode
)
{
if
(
direct
&&
s
->
next_picture_ptr
->
field_picture
)
if
(
direct
&&
s
->
next_picture_ptr
->
field_picture
)
av_log
(
s
->
avctx
,
AV_LOG_WARNING
,
"Mixed frame/field direct mode not supported
\n
"
);
av_log
(
s
->
avctx
,
AV_LOG_WARNING
,
"Mixed frame/field direct mode not supported
\n
"
);
...
@@ -2145,7 +2146,6 @@ static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2],
...
@@ -2145,7 +2146,6 @@ static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2],
s
->
mv
[
0
][
0
][
1
]
=
av_clip
(
s
->
mv
[
0
][
0
][
1
],
-
60
-
(
s
->
mb_y
<<
6
),
(
s
->
mb_height
<<
6
)
-
4
-
(
s
->
mb_y
<<
6
));
s
->
mv
[
0
][
0
][
1
]
=
av_clip
(
s
->
mv
[
0
][
0
][
1
],
-
60
-
(
s
->
mb_y
<<
6
),
(
s
->
mb_height
<<
6
)
-
4
-
(
s
->
mb_y
<<
6
));
s
->
mv
[
1
][
0
][
0
]
=
av_clip
(
s
->
mv
[
1
][
0
][
0
],
-
60
-
(
s
->
mb_x
<<
6
),
(
s
->
mb_width
<<
6
)
-
4
-
(
s
->
mb_x
<<
6
));
s
->
mv
[
1
][
0
][
0
]
=
av_clip
(
s
->
mv
[
1
][
0
][
0
],
-
60
-
(
s
->
mb_x
<<
6
),
(
s
->
mb_width
<<
6
)
-
4
-
(
s
->
mb_x
<<
6
));
s
->
mv
[
1
][
0
][
1
]
=
av_clip
(
s
->
mv
[
1
][
0
][
1
],
-
60
-
(
s
->
mb_y
<<
6
),
(
s
->
mb_height
<<
6
)
-
4
-
(
s
->
mb_y
<<
6
));
s
->
mv
[
1
][
0
][
1
]
=
av_clip
(
s
->
mv
[
1
][
0
][
1
],
-
60
-
(
s
->
mb_y
<<
6
),
(
s
->
mb_height
<<
6
)
-
4
-
(
s
->
mb_y
<<
6
));
}
if
(
direct
)
{
if
(
direct
)
{
s
->
current_picture
.
motion_val
[
0
][
xy
+
v
->
blocks_off
][
0
]
=
s
->
mv
[
0
][
0
][
0
];
s
->
current_picture
.
motion_val
[
0
][
xy
+
v
->
blocks_off
][
0
]
=
s
->
mv
[
0
][
0
][
0
];
s
->
current_picture
.
motion_val
[
0
][
xy
+
v
->
blocks_off
][
1
]
=
s
->
mv
[
0
][
0
][
1
];
s
->
current_picture
.
motion_val
[
0
][
xy
+
v
->
blocks_off
][
1
]
=
s
->
mv
[
0
][
0
][
1
];
...
...
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