diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 21:09:30 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 21:09:30 +0200 |
commit | b3b05a11d31d544025c0400a1c6bc70124300a86 (patch) | |
tree | 66dd99b2b70d25bcb2319225f6a710710f29205f /libavcodec/mpeg4videodec.c | |
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/mpeg4videodec.c')
-rw-r--r-- | libavcodec/mpeg4videodec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 56661b4203..5a36c17543 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2697,7 +2697,7 @@ static int mpeg4_update_thread_context(AVCodecContext *dst, memcpy(((uint8_t*)s) + sizeof(MpegEncContext), ((uint8_t*)s1) + sizeof(MpegEncContext), sizeof(Mpeg4DecContext) - sizeof(MpegEncContext)); if (CONFIG_MPEG4_DECODER && !init && s1->xvid_build >= 0) - ff_xvididct_init(&s->m.idsp, dst); + ff_xvid_idct_init(&s->m.idsp, dst); return 0; } |