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

[pross]

Author: pross
Date: Thu Feb  5 08:57:11 2009
New Revision: 17000

Log:
convert mpeg1_decode_block_intra() to inline global

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

Modified: trunk/libavcodec/mpeg12.c
==============================================================================
--- trunk/libavcodec/mpeg12.c	Thu Feb  5 08:47:39 2009	(r16999)
+++ trunk/libavcodec/mpeg12.c	Thu Feb  5 08:57:11 2009	(r17000)
@@ -49,9 +49,6 @@
 static inline int mpeg1_decode_block_inter(MpegEncContext *s,
                               DCTELEM *block,
                               int n);
-static inline int mpeg1_decode_block_intra(MpegEncContext *s,
-                              DCTELEM *block,
-                              int n);
 static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n);
 static inline int mpeg2_decode_block_non_intra(MpegEncContext *s,
                                         DCTELEM *block,
@@ -327,7 +324,7 @@ static int mpeg_decode_mb(MpegEncContext
             }
         } else {
             for(i=0;i<6;i++) {
-                if (mpeg1_decode_block_intra(s, s->pblocks[i], i) < 0)
+                if (ff_mpeg1_decode_block_intra(s, s->pblocks[i], i) < 0)
                     return -1;
             }
         }
@@ -614,7 +611,7 @@ static int mpeg_decode_motion(MpegEncCon
     return val;
 }
 
-static inline int mpeg1_decode_block_intra(MpegEncContext *s,
+inline int ff_mpeg1_decode_block_intra(MpegEncContext *s,
                                DCTELEM *block,
                                int n)
 {

Modified: trunk/libavcodec/mpeg12.h
==============================================================================
--- trunk/libavcodec/mpeg12.h	Thu Feb  5 08:47:39 2009	(r16999)
+++ trunk/libavcodec/mpeg12.h	Thu Feb  5 08:57:11 2009	(r17000)
@@ -56,4 +56,6 @@ static inline int decode_dc(GetBitContex
     return diff;
 }
 
+extern inline int ff_mpeg1_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n);
+
 #endif /* AVCODEC_MPEG12_H */