From c86c4a7acb99fa53bcb2c6a1fd4463f84f6872aa Mon Sep 17 00:00:00 2001 From: David Rose Date: Mon, 13 Aug 2007 16:06:07 +0000 Subject: [PATCH] compile without FFMPEG --- panda/src/movies/movieAudio.cxx | 4 ++++ panda/src/movies/movieVideo.cxx | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/panda/src/movies/movieAudio.cxx b/panda/src/movies/movieAudio.cxx index 89f61c8d3e..6ad8b62db2 100644 --- a/panda/src/movies/movieAudio.cxx +++ b/panda/src/movies/movieAudio.cxx @@ -112,7 +112,11 @@ make_copy() const { //////////////////////////////////////////////////////////////////// PT(MovieAudio) MovieAudio:: load(const Filename &name) { +#ifdef HAVE_FFMPEG // Someday, I'll probably put a dispatcher here. // But for now, just hardwire it to go to FFMPEG. return new FfmpegAudio(name); +#else + return NULL; +#endif } diff --git a/panda/src/movies/movieVideo.cxx b/panda/src/movies/movieVideo.cxx index 6c980b613a..fa913f280a 100644 --- a/panda/src/movies/movieVideo.cxx +++ b/panda/src/movies/movieVideo.cxx @@ -294,8 +294,12 @@ make_copy() const { //////////////////////////////////////////////////////////////////// PT(MovieVideo) MovieVideo:: load(const Filename &name) { +#ifdef HAVE_FFMPEG // Someday, I'll probably put a dispatcher here. // But for now, just hardwire it to go to FFMPEG. return new FfmpegVideo(name); +#else + return NULL; +#endif }