Fix compilation error of ffmpeg and ffplay with --disable-avdevice.
authorCyril Russo <stage.nexvision@laposte.net>
Thu, 22 Apr 2010 08:55:23 +0000 (08:55 +0000)
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Thu, 22 Apr 2010 08:55:23 +0000 (08:55 +0000)
Patch by Cyril Russo, stage D nexvision A laposte net

Originally committed as revision 22940 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffmpeg.c
ffplay.c

index 81b454f..3b211f0 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -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
index d827d44..e84e290 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -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