diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 16:15:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 16:15:54 +0200 |
| commit | f896f92337e71cc7dd3d4d2c37c8b04435e37d15 (patch) | |
| tree | 8a2c51883ffef3d25214de87dafb22d4dc4f501e /libswscale/yuv2rgb.c | |
| parent | e1c3e6277f095a258a3676263202a595c044f57b (diff) | |
| parent | 67e6a9f558fbf7a72137abd0034a3f11249ab8bb (diff) | |
| download | ffmpeg-streaming-f896f92337e71cc7dd3d4d2c37c8b04435e37d15.zip ffmpeg-streaming-f896f92337e71cc7dd3d4d2c37c8b04435e37d15.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cosmetics: Place arch initialization calls in alphabetical order
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/yuv2rgb.c')
| -rw-r--r-- | libswscale/yuv2rgb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c index 0045e2b..3a80eca 100644 --- a/libswscale/yuv2rgb.c +++ b/libswscale/yuv2rgb.c @@ -601,14 +601,14 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c) { SwsFunc t = NULL; - if (ARCH_X86) - t = ff_yuv2rgb_init_x86(c); - else if (HAVE_VIS) - t = ff_yuv2rgb_init_vis(c); - else if (ARCH_BFIN) + if (ARCH_BFIN) t = ff_yuv2rgb_init_bfin(c); - else if (ARCH_PPC) + if (ARCH_PPC) t = ff_yuv2rgb_init_ppc(c); + if (HAVE_VIS) + t = ff_yuv2rgb_init_vis(c); + if (ARCH_X86) + t = ff_yuv2rgb_init_x86(c); if (t) return t; |
