Commit db2f2093 authored by Måns Rullgård's avatar Måns Rullgård
Browse files

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
parent eb853afb
...@@ -320,7 +320,7 @@ static int mpeg_decode_mb(MpegEncContext *s, ...@@ -320,7 +320,7 @@ static int mpeg_decode_mb(MpegEncContext *s,
} }
} else { } else {
for(i=0;i<6;i++) { 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; return -1;
} }
} }
...@@ -605,7 +605,7 @@ static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred) ...@@ -605,7 +605,7 @@ static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred)
return val; return val;
} }
inline int ff_mpeg1_decode_block_intra(MpegEncContext *s, static inline int mpeg1_decode_block_intra(MpegEncContext *s,
DCTELEM *block, DCTELEM *block,
int n) int n)
{ {
...@@ -678,6 +678,13 @@ inline int ff_mpeg1_decode_block_intra(MpegEncContext *s, ...@@ -678,6 +678,13 @@ inline int ff_mpeg1_decode_block_intra(MpegEncContext *s,
return 0; 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, static inline int mpeg1_decode_block_inter(MpegEncContext *s,
DCTELEM *block, DCTELEM *block,
int n) int n)
......
...@@ -56,6 +56,6 @@ static inline int decode_dc(GetBitContext *gb, int component) ...@@ -56,6 +56,6 @@ static inline int decode_dc(GetBitContext *gb, int component)
return diff; 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 */ #endif /* AVCODEC_MPEG12_H */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment