Mercurial > mplayer.hg

diff mencoder.c @ 23120:f35f14c39023

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify #include directives.
author diego
date Thu, 26 Apr 2007 13:26:41 +0000
parents 9561da3cdc3a
children 2a66d95355f0
line wrap: on
line diff
--- a/mencoder.c	Thu Apr 26 13:20:18 2007 +0000
+++ b/mencoder.c	Thu Apr 26 13:26:41 2007 +0000
@@ -79,13 +79,11 @@
 #include "stream/stream_dvd.h"
 #endif
 
-#ifdef USE_LIBAVCODEC
 #ifdef USE_LIBAVCODEC_SO
 #include <ffmpeg/avcodec.h>
-#else
+#elif USE_LIBAVCODEC_A
 #include "avcodec.h"
 #endif
-#endif
 
 #include "libmpcodecs/ae.h"
 int vo_doublebuffering=0;