diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2005-05-15 23:21:45 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2005-05-15 23:21:45 +0000 |
| commit | f501530c0563b7b6f31481549d969bfbaae4da9e (patch) | |
| tree | be750b59c6c2432a25a03962fb6c96bf6df98a9e | |
| parent | 0b4acb645ba08b534962803c73f4d53dcc4d16ee (diff) | |
| download | xine-lib-f501530c0563b7b6f31481549d969bfbaae4da9e.tar.gz xine-lib-f501530c0563b7b6f31481549d969bfbaae4da9e.tar.bz2 | |
Sync a couple of inlined function definitions with their declarations
(inline v. __inline__).
CVS patchset: 7546
CVS date: 2005/05/15 23:21:45
| -rw-r--r-- | src/libffmpeg/diff_to_ffmpeg_cvs.txt | 20 | ||||
| -rw-r--r-- | src/libffmpeg/libavcodec/motion_est_template.c | 4 |
2 files changed, 22 insertions, 2 deletions
diff --git a/src/libffmpeg/diff_to_ffmpeg_cvs.txt b/src/libffmpeg/diff_to_ffmpeg_cvs.txt index 79be6a68d..d8c47bb6e 100644 --- a/src/libffmpeg/diff_to_ffmpeg_cvs.txt +++ b/src/libffmpeg/diff_to_ffmpeg_cvs.txt @@ -4294,3 +4294,23 @@ int ref_index, int size, int h, int add_rate); /* mpeg12.c */ +--- libavcodec/motion_est_template.c 19 Apr 2005 05:20:36 -0000 1.12 ++++ libavcodec/motion_est_template.c 15 May 2005 23:07:52 -0000 +@@ -231,7 +231,7 @@ + return dmin; + } + +-int inline ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index, ++int __inline__ ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index, + int ref_index, int size, int h, int add_rate) + { + // const int check_luma= s->dsp.me_sub_cmp != s->dsp.mb_cmp; +@@ -962,7 +962,7 @@ + } + + //this function is dedicated to the braindamaged gcc +-inline int ff_epzs_motion_search(MpegEncContext * s, int *mx_ptr, int *my_ptr, ++int __inline__ 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], + int ref_mv_scale, int size, int h) + { diff --git a/src/libffmpeg/libavcodec/motion_est_template.c b/src/libffmpeg/libavcodec/motion_est_template.c index d8101ec33..7113e1ba6 100644 --- a/src/libffmpeg/libavcodec/motion_est_template.c +++ b/src/libffmpeg/libavcodec/motion_est_template.c @@ -231,7 +231,7 @@ static int no_sub_motion_search(MpegEncContext * s, return dmin; } -int inline ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index, +int __inline__ ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index, int ref_index, int size, int h, int add_rate) { // const int check_luma= s->dsp.me_sub_cmp != s->dsp.mb_cmp; @@ -962,7 +962,7 @@ static always_inline int epzs_motion_search_internal(MpegEncContext * s, int *mx } //this function is dedicated to the braindamaged gcc -inline int ff_epzs_motion_search(MpegEncContext * s, int *mx_ptr, int *my_ptr, +int __inline__ 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], int ref_mv_scale, int size, int h) { |