# HG changeset patch # User mswitch # Date 1005743228 0 # Node ID 7345a10e60120151dd2104dd4da539542aa8c764 # Parent 6885bf5662712705633bb350b5bb64116689a604 Disable ao_mpegpes if compiled with libvo2 diff -r 6885bf566271 -r 7345a10e6012 libao2/audio_out.c --- a/libao2/audio_out.c Wed Nov 14 11:51:36 2001 +0000 +++ b/libao2/audio_out.c Wed Nov 14 13:07:08 2001 +0000 @@ -42,7 +42,9 @@ extern ao_functions_t audio_out_dxr3; #endif extern ao_functions_t audio_out_pcm; +#ifndef USE_LIBVO2 extern ao_functions_t audio_out_mpegpes; +#endif extern ao_functions_t audio_out_pss; ao_functions_t* audio_out_drivers[] = @@ -73,7 +75,9 @@ &audio_out_dxr3, #endif &audio_out_pcm, +#ifndef USE_LIBVO2 &audio_out_mpegpes, +#endif // &audio_out_pss, NULL };