diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 14:53:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 14:53:44 +0200 |
| commit | 8251529ff37e0fdfb4ee6ba74f14ebc200e0ae2f (patch) | |
| tree | de72668e33d69ea1b5e6573686d549494342fe92 | |
| parent | 37494bdb0d42c222c302270f3a83e38ae2131887 (diff) | |
| parent | 70dd8892bf00923af838756dfbb356a9b1e4e40d (diff) | |
| download | ffmpeg-8251529ff37e0fdfb4ee6ba74f14ebc200e0ae2f.tar.gz | |
Merge commit '70dd8892bf00923af838756dfbb356a9b1e4e40d'
* commit '70dd8892bf00923af838756dfbb356a9b1e4e40d':
mpegvideo: Replace arch initialization ifdeffery by standard conditionals
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpegvideo.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 4b60900d6c..00ced1f926 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -168,17 +168,16 @@ av_cold int ff_dct_common_init(MpegEncContext *s) s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_bitexact; s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_c; -#if ARCH_X86 - ff_MPV_common_init_x86(s); -#elif ARCH_ALPHA - ff_MPV_common_init_axp(s); -#elif ARCH_ARM - ff_MPV_common_init_arm(s); -#elif ARCH_BFIN - ff_MPV_common_init_bfin(s); -#elif ARCH_PPC - ff_MPV_common_init_ppc(s); -#endif + if (ARCH_ALPHA) + ff_MPV_common_init_axp(s); + if (ARCH_ARM) + ff_MPV_common_init_arm(s); + if (ARCH_BFIN) + ff_MPV_common_init_bfin(s); + if (ARCH_PPC) + ff_MPV_common_init_ppc(s); + if (ARCH_X86) + ff_MPV_common_init_x86(s); /* load & permutate scantables * note: only wmv uses different ones |