[Ffmpeg-cvslog] r6591 - in trunk/libavcodec: motion_est_template.c mpegvideo.h

rathann subversion
Sun Oct 8 23:11:03 CEST 2006


Author: rathann
Date: Sun Oct  8 23:11:03 2006
New Revision: 6591

Modified:
   trunk/libavcodec/motion_est_template.c
   trunk/libavcodec/mpegvideo.h

Log:
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.


Modified: trunk/libavcodec/motion_est_template.c
==============================================================================
--- trunk/libavcodec/motion_est_template.c	(original)
+++ trunk/libavcodec/motion_est_template.c	Sun Oct  8 23:11:03 2006
@@ -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;

Modified: trunk/libavcodec/mpegvideo.h
==============================================================================
--- trunk/libavcodec/mpegvideo.h	(original)
+++ trunk/libavcodec/mpegvideo.h	Sun Oct  8 23:11:03 2006
@@ -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 */




More information about the ffmpeg-cvslog mailing list