changeset 8743:92f032e1f9e1 libavcodec

convert mpeg1_decode_block_intra() to inline global
author pross
date Thu, 05 Feb 2009 07:57:11 +0000
parents ecabe55b66bb
children 9e7d7122a421
files mpeg12.c mpeg12.h
diffstat 2 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mpeg12.c	Wed Feb 04 21:28:58 2009 +0000
+++ b/mpeg12.c	Thu Feb 05 07:57:11 2009 +0000
@@ -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 @@
             }
         } 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 @@
     return val;
 }
 
-static inline int mpeg1_decode_block_intra(MpegEncContext *s,
+inline int ff_mpeg1_decode_block_intra(MpegEncContext *s,
                                DCTELEM *block,
                                int n)
 {
--- a/mpeg12.h	Wed Feb 04 21:28:58 2009 +0000
+++ b/mpeg12.h	Thu Feb 05 07:57:11 2009 +0000
@@ -56,4 +56,6 @@
     return diff;
 }
 
+extern inline int ff_mpeg1_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n);
+
 #endif /* AVCODEC_MPEG12_H */