convert mpeg1_decode_block_intra() to inline global

Originally committed as revision 17000 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Peter Ross 2009-02-05 07:57:11 +00:00
parent 1c7c6669f6
commit 50240e5646
2 changed files with 4 additions and 5 deletions

View File

@ -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 @@ static int mpeg_decode_mb(MpegEncContext *s,
}
} 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 @@ static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred)
return val;
}
static inline int mpeg1_decode_block_intra(MpegEncContext *s,
inline int ff_mpeg1_decode_block_intra(MpegEncContext *s,
DCTELEM *block,
int n)
{

View File

@ -56,4 +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);
#endif /* AVCODEC_MPEG12_H */