virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit '70dd8892bf00923af838756dfbb356a9b1e4e40d'

Browse Source 
* commit '70dd8892bf00923af838756dfbb356a9b1e4e40d':
  mpegvideo: Replace arch initialization ifdeffery by standard conditionals

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-08-29 14:53:39 +02:00
parent 37494bdb0d 70dd8892bf
commit 8251529ff3
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/mpegvideo.c
View File

@@ -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_intra = dct_unquantize_mpeg2_intra_bitexact;
s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_c; s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_c;
#if ARCH_X86 if (ARCH_ALPHA)
ff_MPV_common_init_x86(s); ff_MPV_common_init_axp(s);
#elif ARCH_ALPHA if (ARCH_ARM)
ff_MPV_common_init_axp(s); ff_MPV_common_init_arm(s);
#elif ARCH_ARM if (ARCH_BFIN)
ff_MPV_common_init_arm(s); ff_MPV_common_init_bfin(s);
#elif ARCH_BFIN if (ARCH_PPC)
ff_MPV_common_init_bfin(s); ff_MPV_common_init_ppc(s);
#elif ARCH_PPC if (ARCH_X86)
ff_MPV_common_init_ppc(s); ff_MPV_common_init_x86(s);
#endif
/* load & permutate scantables /* load & permutate scantables
* note: only wmv uses different ones * note: only wmv uses different ones