# HG changeset patch # User mru # Date 1242521669 0 # Node ID 6d75bcdeaa30336924c2812d59f426b1af0511d8 # Parent b4350a6fb24ac29cdc2659099cda1f46b9c2ee3d 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. diff -r b4350a6fb24a -r 6d75bcdeaa30 mpeg12.c --- 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) diff -r b4350a6fb24a -r 6d75bcdeaa30 mpeg12.h --- 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 */