From 9cfd8827334f5ec1eb1254b6f75a981cc90f86d8 Mon Sep 17 00:00:00 2001
From: Sacha <xsacha@gmail.com>
Date: Fri, 1 Nov 2013 03:46:46 +1000
Subject: [PATCH] Blackberry: Use -O2 instead of -O3 to prevent crashes with
 GCC 4.8.1. Update ffmpeg.

---
 CMakeLists.txt | 2 +-
 ffmpeg         | 2 +-
 native         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b942d0c65..57e7df87cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -160,7 +160,7 @@ if(NOT MSVC)
 	endif()
 
 	if(BLACKBERRY)
-		add_definitions(-D_QNX_SOURCE -O3 -mfpu=neon -mtune=cortex-a9)
+		add_definitions(-D_QNX_SOURCE -O2 -mfpu=neon -mtune=cortex-a9)
 	endif()
 
 	if(X86 AND NOT MIPS)
diff --git a/ffmpeg b/ffmpeg
index 926573efd2..53b1ac97da 160000
--- a/ffmpeg
+++ b/ffmpeg
@@ -1 +1 @@
-Subproject commit 926573efd237bb47770c2117cdc3de472559eb7f
+Subproject commit 53b1ac97dad881d832f0acc45b6e7acebbfcde6e
diff --git a/native b/native
index 55b8a95a29..4c8922d9e7 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit 55b8a95a29c469a4ea3edc67a297bc31ed93589d
+Subproject commit 4c8922d9e70cbebc54c2d5a36d52e79339feeff0