aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCyril Russo <stage.nexvision@laposte.net>2010-04-22 08:55:23 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2010-04-22 08:55:23 +0000
commit9b157b0ccd259f4b9f3f0066e75cb7b5e94ab525 (patch)
tree691fb268a50613081a88d2b27b1af1c178bb1bbf
parent9d30e0682a792436e1880fd6ce51966d50ec9c2b (diff)
downloadffmpeg-9b157b0ccd259f4b9f3f0066e75cb7b5e94ab525.tar.gz
Fix compilation error of ffmpeg and ffplay with --disable-avdevice.
Patch by Cyril Russo, stage D nexvision A laposte net Originally committed as revision 22940 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffmpeg.c2
-rw-r--r--ffplay.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 81b454f025..3b211f0873 100644
--- 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
diff --git a/ffplay.c b/ffplay.c
index d827d4461b..e84e290be7 100644
--- 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