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
b4f1636a
Commit
b4f1636a
authored
Dec 11, 2015
by
Ganesh Ajjanagadde
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: typo fix cliping -> clipping, saftey -> safety
Signed-off-by:
Ganesh Ajjanagadde
<
gajjanagadde@gmail.com
>
parent
edfc835a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
acelp_filters.c
libavcodec/acelp_filters.c
+1
-1
motion_est.c
libavcodec/motion_est.c
+3
-3
No files found.
libavcodec/acelp_filters.c
View file @
b4f1636a
...
...
@@ -70,7 +70,7 @@ void ff_acelp_interpolate(int16_t* out, const int16_t* in,
v
+=
in
[
n
-
i
]
*
filter_coeffs
[
idx
-
frac_pos
];
}
if
(
av_clip_int16
(
v
>>
15
)
!=
(
v
>>
15
))
av_log
(
NULL
,
AV_LOG_WARNING
,
"overflow that would need cliping in ff_acelp_interpolate()
\n
"
);
av_log
(
NULL
,
AV_LOG_WARNING
,
"overflow that would need clip
p
ing in ff_acelp_interpolate()
\n
"
);
out
[
n
]
=
v
>>
15
;
}
}
...
...
libavcodec/motion_est.c
View file @
b4f1636a
...
...
@@ -599,7 +599,7 @@ static inline int h263_mv4_search(MpegEncContext *s, int mx, int my, int shift)
int
same
=
1
;
const
int
stride
=
c
->
stride
;
uint8_t
*
mv_penalty
=
c
->
current_mv_penalty
;
int
saf
tey_cli
ping
=
s
->
unrestricted_mv
&&
(
s
->
width
&
15
)
&&
(
s
->
height
&
15
);
int
saf
ety_clip
ping
=
s
->
unrestricted_mv
&&
(
s
->
width
&
15
)
&&
(
s
->
height
&
15
);
init_mv4_ref
(
c
);
...
...
@@ -611,7 +611,7 @@ static inline int h263_mv4_search(MpegEncContext *s, int mx, int my, int shift)
const
int
mot_stride
=
s
->
b8_stride
;
const
int
mot_xy
=
s
->
block_index
[
block
];
if
(
saf
tey_cli
ping
){
if
(
saf
ety_clip
ping
){
c
->
xmax
=
-
16
*
s
->
mb_x
+
s
->
width
-
8
*
(
block
&
1
);
c
->
ymax
=
-
16
*
s
->
mb_y
+
s
->
height
-
8
*
(
block
>>
1
);
}
...
...
@@ -643,7 +643,7 @@ static inline int h263_mv4_search(MpegEncContext *s, int mx, int my, int shift)
}
P_MV1
[
0
]
=
mx
;
P_MV1
[
1
]
=
my
;
if
(
saf
tey_cli
ping
)
if
(
saf
ety_clip
ping
)
for
(
i
=
1
;
i
<
10
;
i
++
){
if
(
s
->
first_slice_line
&&
block
<
2
&&
i
>
1
&&
i
<
9
)
continue
;
...
...
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