# HG changeset patch # User pross # Date 1233820631 0 # Node ID 92f032e1f9e10978401ad447c802a289393bfd92 # Parent ecabe55b66bb833ff132042cd59267d2a679a87e convert mpeg1_decode_block_intra() to inline global diff -r ecabe55b66bb -r 92f032e1f9e1 mpeg12.c --- a/mpeg12.c Wed Feb 04 21:28:58 2009 +0000 +++ b/mpeg12.c Thu Feb 05 07:57:11 2009 +0000 @@ -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 @@ } } 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 @@ return val; } -static inline int mpeg1_decode_block_intra(MpegEncContext *s, +inline int ff_mpeg1_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n) { diff -r ecabe55b66bb -r 92f032e1f9e1 mpeg12.h --- a/mpeg12.h Wed Feb 04 21:28:58 2009 +0000 +++ b/mpeg12.h Thu Feb 05 07:57:11 2009 +0000 @@ -56,4 +56,6 @@ return diff; } +extern inline int ff_mpeg1_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n); + #endif /* AVCODEC_MPEG12_H */