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
c192426f
Commit
c192426f
authored
May 28, 2008
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix return type of ff_init_me().
Originally committed as revision 13487 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
7a7718e3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
motion_est.c
libavcodec/motion_est.c
+3
-1
mpegvideo.h
libavcodec/mpegvideo.h
+1
-1
No files found.
libavcodec/motion_est.c
View file @
c192426f
...
...
@@ -231,7 +231,7 @@ static int zero_cmp(void *s, uint8_t *a, uint8_t *b, int stride, int h){
static
void
zero_hpel
(
uint8_t
*
a
,
const
uint8_t
*
b
,
int
stride
,
int
h
){
}
void
ff_init_me
(
MpegEncContext
*
s
){
int
ff_init_me
(
MpegEncContext
*
s
){
MotionEstContext
*
const
c
=
&
s
->
me
;
int
cache_size
=
FFMIN
(
ME_MAP_SIZE
>>
ME_MAP_SHIFT
,
1
<<
ME_MAP_SHIFT
);
int
dia_size
=
FFMAX
(
FFABS
(
s
->
avctx
->
dia_size
)
&
255
,
FFABS
(
s
->
avctx
->
pre_dia_size
)
&
255
);
...
...
@@ -303,6 +303,8 @@ void ff_init_me(MpegEncContext *s){
}
c
->
temp
=
c
->
scratchpad
;
return
0
;
}
#if 0
...
...
libavcodec/mpegvideo.h
View file @
c192426f
...
...
@@ -741,7 +741,7 @@ int ff_get_best_fcode(MpegEncContext * s, int16_t (*mv_table)[2], int type);
void
ff_fix_long_p_mvs
(
MpegEncContext
*
s
);
void
ff_fix_long_mvs
(
MpegEncContext
*
s
,
uint8_t
*
field_select_table
,
int
field_select
,
int16_t
(
*
mv_table
)[
2
],
int
f_code
,
int
type
,
int
truncate
);
void
ff_init_me
(
MpegEncContext
*
s
);
int
ff_init_me
(
MpegEncContext
*
s
);
int
ff_pre_estimate_p_frame_motion
(
MpegEncContext
*
s
,
int
mb_x
,
int
mb_y
);
int
ff_epzs_motion_search
(
MpegEncContext
*
s
,
int
*
mx_ptr
,
int
*
my_ptr
,
int
P
[
10
][
2
],
int
src_index
,
int
ref_index
,
int16_t
(
*
last_mv
)[
2
],
...
...
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