From 3a252a81c9639ed7c4d18a7ecfbedd2181d8a33e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 7 Feb 2012 10:10:07 +0000
Subject: [PATCH] Use C++ compiler.

---
 .gitignore                 | 1 +
 ffmpeg/Makefile            | 2 ++
 ffmpeg/make.sh             | 1 -
 ffmpeg/{test.c => test.cc} | 2 ++
 4 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 .gitignore
 create mode 100644 ffmpeg/Makefile
 delete mode 100644 ffmpeg/make.sh
 rename ffmpeg/{test.c => test.cc} (99%)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..b25c15b81
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*~
diff --git a/ffmpeg/Makefile b/ffmpeg/Makefile
new file mode 100644
index 000000000..99cfdbcd9
--- /dev/null
+++ b/ffmpeg/Makefile
@@ -0,0 +1,2 @@
+test:	test.cc
+	g++ -D__STDC_CONSTANT_MACROS -Wall -o test test.cc `pkg-config --cflags --libs libavformat libswscale`
diff --git a/ffmpeg/make.sh b/ffmpeg/make.sh
deleted file mode 100644
index 46471509f..000000000
--- a/ffmpeg/make.sh
+++ /dev/null
@@ -1 +0,0 @@
-gcc -D__STDC_CONSTANT_MACROS -c -Wall -std=c99 -o test.o test.c && gcc -o test test.o `pkg-config --cflags --libs libavformat libswscale`
diff --git a/ffmpeg/test.c b/ffmpeg/test.cc
similarity index 99%
rename from ffmpeg/test.c
rename to ffmpeg/test.cc
index ec8db2a1f..52b32dd9a 100644
--- a/ffmpeg/test.c
+++ b/ffmpeg/test.cc
@@ -1,6 +1,8 @@
+extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libswscale/swscale.h>
+}
 
 char const video[] = "/home/carl/Films/A town called panic.divx";//Ghostbusters.avi";
 
-- 
2.30.2