[SCM] libav/experimental: convert mpeg1_decode_block_intra() to inline global

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 50240e564673222010678c0c1595b97c4a83f3c9
Author: Peter Ross <pross at xvid.org>
Date:   Thu Feb 5 07:57:11 2009 +0000

    convert mpeg1_decode_block_intra() to inline global
    
    Originally committed as revision 17000 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 0c6ef7a..dd7ecff 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -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 *s,
             }
         } 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(MpegEncContext *s, int fcode, int pred)
     return val;
 }
 
-static inline int mpeg1_decode_block_intra(MpegEncContext *s,
+inline int ff_mpeg1_decode_block_intra(MpegEncContext *s,
                                DCTELEM *block,
                                int n)
 {
diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h
index e65bb43..dbbe8e4 100644
--- a/libavcodec/mpeg12.h
+++ b/libavcodec/mpeg12.h
@@ -56,4 +56,6 @@ static inline int decode_dc(GetBitContext *gb, int component)
     return diff;
 }
 
+extern inline int ff_mpeg1_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n);
+
 #endif /* AVCODEC_MPEG12_H */

-- 
Libav/FFmpeg packaging