[FFmpeg-cvslog] r17392 - in trunk/libavcodec: h264.c vc1.c

diego subversion
Tue Feb 17 13:11:46 CET 2009


Author: diego
Date: Tue Feb 17 13:11:46 2009
New Revision: 17392

Log:
cosmetics: 'void/int inline' --> 'inline void/int' to avoid warnings of the type
"'inline' is not at beginning of declaration" with -Wextra.

Modified:
   trunk/libavcodec/h264.c
   trunk/libavcodec/vc1.c

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	Tue Feb 17 13:03:10 2009	(r17391)
+++ trunk/libavcodec/h264.c	Tue Feb 17 13:11:46 2009	(r17392)
@@ -6266,7 +6266,7 @@ static void filter_mb_fast( H264Context 
 }
 
 
-static void av_always_inline filter_mb_dir(H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize, int mb_xy, int mb_type, int mvy_limit, int first_vertical_edge_done, int dir) {
+static av_always_inline void filter_mb_dir(H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize, int mb_xy, int mb_type, int mvy_limit, int first_vertical_edge_done, int dir) {
     MpegEncContext * const s = &h->s;
     int edge;
     const int mbm_xy = dir == 0 ? mb_xy -1 : h->top_mb_xy;

Modified: trunk/libavcodec/vc1.c
==============================================================================
--- trunk/libavcodec/vc1.c	Tue Feb 17 13:03:10 2009	(r17391)
+++ trunk/libavcodec/vc1.c	Tue Feb 17 13:11:46 2009	(r17392)
@@ -318,7 +318,7 @@ static int bitplane_decoding(uint8_t* da
  * @return whether other 3 pairs should be filtered or not
  * @see 8.6
  */
-static int av_always_inline vc1_filter_line(uint8_t* src, int stride, int pq){
+static av_always_inline int vc1_filter_line(uint8_t* src, int stride, int pq){
     uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
 
     int a0 = (2*(src[-2*stride] - src[ 1*stride]) - 5*(src[-1*stride] - src[ 0*stride]) + 4) >> 3;




More information about the ffmpeg-cvslog mailing list