[FFmpeg-devel] [PATCH v2 2/4] ffplay: make copy for SDL1

Josh de Kock josh at itanimul.li
Thu Sep 15 11:39:05 EEST 2016


Signed-off-by: Josh de Kock <josh at itanimul.li>
---
 Makefile                  | 1 +
 ffplay.c                  | 5 +++++
 ffplay.c => ffplay_sdl1.c | 0
 3 files changed, 6 insertions(+)
 copy ffplay.c => ffplay_sdl1.c (100%)

diff --git a/Makefile b/Makefile
index 8aa72fd..15ba3df 100644
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,7 @@ ALLAVPROGS_G = $(AVBASENAMES:%=%$(PROGSSUF)_g$(EXESUF))
 $(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog) += cmdutils.o))
 $(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog)-$(CONFIG_OPENCL) += cmdutils_opencl.o))
 
+OBJS-ffplay-$(HAVE_SDL)       += ffplay_sdl1.o
 OBJS-ffmpeg                   += ffmpeg_opt.o ffmpeg_filter.o
 OBJS-ffmpeg-$(CONFIG_VIDEOTOOLBOX) += ffmpeg_videotoolbox.o
 OBJS-ffmpeg-$(CONFIG_LIBMFX)  += ffmpeg_qsv.o
diff --git a/ffplay.c b/ffplay.c
index adbe9cb..67a17e0 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -24,6 +24,9 @@
  */
 
 #include "config.h"
+
+#if HAVE_SDL2
+
 #include <inttypes.h>
 #include <math.h>
 #include <limits.h>
@@ -3863,3 +3866,5 @@ int main(int argc, char **argv)
 
     return 0;
 }
+
+#endif
diff --git a/ffplay.c b/ffplay_sdl1.c
similarity index 100%
copy from ffplay.c
copy to ffplay_sdl1.c
-- 
2.7.4 (Apple Git-66)



More information about the ffmpeg-devel mailing list