From 7ee84eb811ef1e5085a16c0430f791ef606fa038 Mon Sep 17 00:00:00 2001
From: Sacha <xsacha@gmail.com>
Date: Sat, 11 May 2013 00:55:00 +1000
Subject: [PATCH] Add FFMPEG support to Blackberry10

---
 CMakeLists.txt | 5 +++++
 ffmpeg         | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7150a21c6..c982e1d46e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -455,6 +455,11 @@ elseif(USING_QT_UI)
 elseif(BLACKBERRY)
 	set(nativeExtra ${nativeExtra} native/base/BlackberryMain.cpp)
 	set(nativeExtraLibs ${nativeExtraLibs} asound bps screen socket EGL)
+	# FFMPEG
+	add_definitions(-DUSE_FFMPEG)
+	include_directories(ffmpeg/blackberry/armv7/include)
+	link_directories(ffmpeg/blackberry/armv7/lib)
+	set(nativeExtraLibs ${nativeExtraLibs} iconv libavformat.a libavcodec.a libswresample.a libavutil.a)
 	set(TargetBin PPSSPPBlackberry)
 elseif(SDL_FOUND)
 	# Require SDL
diff --git a/ffmpeg b/ffmpeg
index 1b89089c9c..df276d73d5 160000
--- a/ffmpeg
+++ b/ffmpeg
@@ -1 +1 @@
-Subproject commit 1b89089c9c2f2213ca297595bc36ca67e77cef81
+Subproject commit df276d73d58dae38137f81d5193e6068f32d0724