Mercurial > libavcodec.hg

changeset 3959:514c6726b83b libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes: mpegvideo.h:777: warning: ¡Æinline¡Ç is not at beginning of declaration motion_est_template.c:236: warning: ¡Æinline¡Ç is not at beginning of declaration Approved by Diego.
author rathann
date Sun, 08 Oct 2006 21:11:03 +0000
parents f48a01a0d3dc
children d075bbfca527
files motion_est_template.c mpegvideo.h
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/motion_est_template.c	Sun Oct 08 14:32:27 2006 +0000
+++ b/motion_est_template.c	Sun Oct 08 21:11:03 2006 +0000
@@ -233,7 +233,7 @@
     return dmin;
 }
 
-int inline ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index,
+inline int 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;
--- a/mpegvideo.h	Sun Oct 08 14:32:27 2006 +0000
+++ b/mpegvideo.h	Sun Oct 08 21:11:03 2006 +0000
@@ -774,7 +774,7 @@
 inline 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],
                              int ref_mv_scale, int size, int h);
-int inline ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index,
+inline int ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index,
                                int ref_index, int size, int h, int add_rate);
 
 /* mpeg12.c */