[FFmpeg-cvslog] r18859 - in trunk/libavcodec: mpeg12.c mpeg12.h

[mru]

Author: mru
Date: Sun May 17 02:54:29 2009
New Revision: 18859

Log:
mpeg12: fix non-standard use of "extern inline"

Rename ff_mpeg1_decode_block_intra to mpeg1_decode_block_intra and
make it static.  Add ff_mpeg1_decode_block_intra as plain extern
function calling mpeg1_decode_block_intra.

Modified:
   trunk/libavcodec/mpeg12.c
   trunk/libavcodec/mpeg12.h

Modified: trunk/libavcodec/mpeg12.c
==============================================================================
--- trunk/libavcodec/mpeg12.c	Sat May 16 19:11:47 2009	(r18858)
+++ trunk/libavcodec/mpeg12.c	Sun May 17 02:54:29 2009	(r18859)
@@ -320,7 +320,7 @@ static int mpeg_decode_mb(MpegEncContext
             }
         } else {
             for(i=0;i<6;i++) {
-                if (ff_mpeg1_decode_block_intra(s, *s->pblocks[i], i) < 0)
+                if (mpeg1_decode_block_intra(s, *s->pblocks[i], i) < 0)
                     return -1;
             }
         }
@@ -605,7 +605,7 @@ static int mpeg_decode_motion(MpegEncCon
     return val;
 }
 
-inline int ff_mpeg1_decode_block_intra(MpegEncContext *s,
+static inline int mpeg1_decode_block_intra(MpegEncContext *s,
                                DCTELEM *block,
                                int n)
 {
@@ -678,6 +678,13 @@ inline int ff_mpeg1_decode_block_intra(M
    return 0;
 }
 
+int ff_mpeg1_decode_block_intra(MpegEncContext *s,
+                                DCTELEM *block,
+                                int n)
+{
+    return mpeg1_decode_block_intra(s, block, n);
+}
+
 static inline int mpeg1_decode_block_inter(MpegEncContext *s,
                                DCTELEM *block,
                                int n)

Modified: trunk/libavcodec/mpeg12.h
==============================================================================
--- trunk/libavcodec/mpeg12.h	Sat May 16 19:11:47 2009	(r18858)
+++ trunk/libavcodec/mpeg12.h	Sun May 17 02:54:29 2009	(r18859)
@@ -56,6 +56,6 @@ static inline int decode_dc(GetBitContex
     return diff;
 }
 
-extern inline int ff_mpeg1_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n);
+extern int ff_mpeg1_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n);
 
 #endif /* AVCODEC_MPEG12_H */