diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 11:20:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 11:20:41 +0100 |
| commit | 63a97d56748a5deaaf5b9c26ac49f5086a8cceeb (patch) | |
| tree | 291953499757de6345b4b7c063f27761d206050d /libavcodec/mpeg12.h | |
| parent | b1064dd783b25b80ec0790876877bc886c2ec449 (diff) | |
| parent | b6649ab5037fb55f78c2606f3d23cea0867cdeaa (diff) | |
| download | ffmpeg-63a97d56748a5deaaf5b9c26ac49f5086a8cceeb.tar.gz | |
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>
Diffstat (limited to 'libavcodec/mpeg12.h')
| -rw-r--r-- | libavcodec/mpeg12.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index 1f369176a5..87ccfa811e 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -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 */ |