Mercurial > libavcodec.hg

changeset 9660:6d75bcdeaa30 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author mru
date Sun, 17 May 2009 00:54:29 +0000
parents b4350a6fb24a
children 1fe22274393a
files mpeg12.c mpeg12.h
diffstat 2 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mpeg12.c	Sat May 16 17:02:44 2009 +0000
+++ b/mpeg12.c	Sun May 17 00:54:29 2009 +0000
@@ -320,7 +320,7 @@
             }
         } 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 @@
     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 @@
    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)
--- a/mpeg12.h	Sat May 16 17:02:44 2009 +0000
+++ b/mpeg12.h	Sun May 17 00:54:29 2009 +0000
@@ -56,6 +56,6 @@
     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 */