diff options
author | Cyril Russo <stage.nexvision@laposte.net> | 2010-04-22 08:55:23 +0000 |
---|---|---|
committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-04-22 08:55:23 +0000 |
commit | 9b157b0ccd259f4b9f3f0066e75cb7b5e94ab525 (patch) | |
tree | 691fb268a50613081a88d2b27b1af1c178bb1bbf | |
parent | 9d30e0682a792436e1880fd6ce51966d50ec9c2b (diff) | |
download | ffmpeg-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.c | 2 | ||||
-rw-r--r-- | ffplay.c | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -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 @@ -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 |