diff options
| author | Måns Rullgård <mans@mansr.com> | 2009-05-17 00:54:29 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2009-05-17 00:54:29 +0000 |
| commit | db2f209352272c0c3a48feb9a15bf773d5272c28 (patch) | |
| tree | 5628c78529b25d71c119e3638135cff535cc0a08 /libavcodec | |
| parent | eb853afb8a2813a27defbecbedf31ce0ce94e678 (diff) | |
| download | ffmpeg-db2f209352272c0c3a48feb9a15bf773d5272c28.tar.gz | |
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.
Originally committed as revision 18859 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpeg12.c | 11 | ||||
| -rw-r--r-- | libavcodec/mpeg12.h | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 44a1d987cf..c649948fab 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -320,7 +320,7 @@ static int mpeg_decode_mb(MpegEncContext *s, } } 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 @@ static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred) 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 @@ inline int ff_mpeg1_decode_block_intra(MpegEncContext *s, 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 --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index dbbe8e43ec..30bb675d35 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -56,6 +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); +extern int ff_mpeg1_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n); #endif /* AVCODEC_MPEG12_H */ |