[FFmpeg-cvslog] r22940 - in trunk: ffmpeg.c ffplay.c

[cehoyos]

Author: cehoyos
Date: Thu Apr 22 10:55:23 2010
New Revision: 22940

Log:
Fix compilation error of ffmpeg and ffplay with --disable-avdevice.

Patch by Cyril Russo, stage D nexvision A laposte net

Modified:
   trunk/ffmpeg.c
   trunk/ffplay.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Wed Apr 21 23:19:25 2010	(r22939)
+++ trunk/ffmpeg.c	Thu Apr 22 10:55:23 2010	(r22940)
@@ -4077,7 +4077,9 @@ int main(int argc, char **argv)
     int64_t ti;
 
     avcodec_register_all();
+#if CONFIG_AVDEVICE
     avdevice_register_all();
+#endif
     av_register_all();
 
 #if HAVE_ISATTY

Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c	Wed Apr 21 23:19:25 2010	(r22939)
+++ trunk/ffplay.c	Thu Apr 22 10:55:23 2010	(r22940)
@@ -3100,7 +3100,9 @@ int main(int argc, char **argv)
 
     /* register all codecs, demux and protocols */
     avcodec_register_all();
+#if CONFIG_AVDEVICE
     avdevice_register_all();
+#endif
 #if CONFIG_AVFILTER
     avfilter_register_all();
 #endif