# HG changeset patch # User diego # Date 1174656668 0 # Node ID c6eed74202154d821ab7879e10d6a028e194cf81 # Parent 7989c3586b9e0ab6d6a31a853f5e1afc92d44e62 cosmetics: Merge #ifdefs for better readability. diff -r 7989c3586b9e -r c6eed7420215 libmpcodecs/vf.c --- a/libmpcodecs/vf.c Fri Mar 23 01:48:54 2007 +0000 +++ b/libmpcodecs/vf.c Fri Mar 23 13:31:08 2007 +0000 @@ -124,6 +124,7 @@ #ifdef USE_LIBAVCODEC &vf_info_lavc, &vf_info_lavcdeint, + &vf_info_pp7, #endif #ifdef HAVE_ZR &vf_info_zrmjpeg, @@ -173,13 +174,11 @@ &vf_info_fspp, &vf_info_qp, &vf_info_mcdeint, + &vf_info_geq, #endif &vf_info_yuvcsp, &vf_info_kerndeint, &vf_info_rgbtest, -#ifdef USE_LIBAVCODEC - &vf_info_pp7, -#endif &vf_info_phase, &vf_info_divtc, &vf_info_harddup, @@ -192,9 +191,6 @@ #endif &vf_info_yadif, &vf_info_blackframe, -#ifdef USE_LIBAVCODEC_DSPUTIL - &vf_info_geq, -#endif NULL };