diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 23:09:30 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 23:09:30 +0400 |
| commit | b3b05a11d31d544025c0400a1c6bc70124300a86 (patch) | |
| tree | 66dd99b2b70d25bcb2319225f6a710710f29205f /libavcodec/xvididct.h | |
| parent | 3ff5ca89fc8783cabed56887f556bdd83279ffb0 (diff) | |
| parent | dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5 (diff) | |
Merge commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5'
* commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5':
cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTs
Conflicts:
libavcodec/mpeg4videodec.c
libavcodec/x86/Makefile
libavcodec/x86/dct-test.c
libavcodec/x86/xvididct_sse2.c
libavcodec/xvididct.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xvididct.h')
| -rw-r--r-- | libavcodec/xvididct.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/xvididct.h b/libavcodec/xvididct.h index 1b95cb752c..b0233c342c 100644 --- a/libavcodec/xvididct.h +++ b/libavcodec/xvididct.h @@ -22,9 +22,9 @@ #include "avcodec.h" #include "idctdsp.h" -void ff_xvididct_init(IDCTDSPContext *c, AVCodecContext *avctx); +void ff_xvid_idct_init(IDCTDSPContext *c, AVCodecContext *avctx); -void ff_xvididct_init_x86(IDCTDSPContext *c); +void ff_xvid_idct_init_x86(IDCTDSPContext *c); void ff_idct_xvid(int16_t *const In); |