Commit 50240e56 authored by Peter Ross's avatar Peter Ross

convert mpeg1_decode_block_intra() to inline global

Originally committed as revision 17000 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 1c7c6669
...@@ -49,9 +49,6 @@ ...@@ -49,9 +49,6 @@
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);
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 mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n);
static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, static inline int mpeg2_decode_block_non_intra(MpegEncContext *s,
DCTELEM *block, DCTELEM *block,
...@@ -327,7 +324,7 @@ static int mpeg_decode_mb(MpegEncContext *s, ...@@ -327,7 +324,7 @@ static int mpeg_decode_mb(MpegEncContext *s,
} }
} else { } else {
for(i=0;i<6;i++) { 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; return -1;
} }
} }
...@@ -614,7 +611,7 @@ static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred) ...@@ -614,7 +611,7 @@ static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred)
return val; return val;
} }
static inline int mpeg1_decode_block_intra(MpegEncContext *s, inline int ff_mpeg1_decode_block_intra(MpegEncContext *s,
DCTELEM *block, DCTELEM *block,
int n) int n)
{ {
......
...@@ -56,4 +56,6 @@ static inline int decode_dc(GetBitContext *gb, int component) ...@@ -56,4 +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);
#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