Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'
* commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa': cosmetics: Remove unnecessary extern keywords from function declarations Conflicts: libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
@@ -71,6 +71,6 @@ static inline int decode_dc(GetBitContext *gb, int component)
|
||||
return diff;
|
||||
}
|
||||
|
||||
extern int ff_mpeg1_decode_block_intra(MpegEncContext *s, int16_t *block, int n);
|
||||
int ff_mpeg1_decode_block_intra(MpegEncContext *s, int16_t *block, int n);
|
||||
|
||||
#endif /* AVCODEC_MPEG12_H */
|
||||
|
||||
Reference in New Issue
Block a user