[Android] Update libVLC hash and fix compilation
Jean-Baptiste Kempf
git at videolan.org
Fri Jul 8 12:06:42 CEST 2016
vlc-android | branch: 2.0.x | Jean-Baptiste Kempf <jb at videolan.org> | Sat Jun 18 19:37:52 2016 +0200| [ba492676fcd62bb85057f80e70d6c24564c79c61] | committer: Jean-Baptiste Kempf
Update libVLC hash and fix compilation
(cherry picked from commit 0f135d649f444a1c6e6e30180d36f4e29ed3b9e3)
> https://code.videolan.org/videolan/vlc-android/commit/ba492676fcd62bb85057f80e70d6c24564c79c61
---
compile.sh | 2 +-
libvlc/jni/modules/demuxdump2.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/compile.sh b/compile.sh
index b7c3f43..a97255e 100755
--- a/compile.sh
+++ b/compile.sh
@@ -153,7 +153,7 @@ fi
# Fetch VLC source #
####################
-TESTED_HASH=848f58d
+TESTED_HASH=6c4e9a8
if [ ! -d "vlc" ]; then
echo "VLC source not found, cloning"
git clone git://git.videolan.org/vlc.git vlc
diff --git a/libvlc/jni/modules/demuxdump2.c b/libvlc/jni/modules/demuxdump2.c
index d2952a7..b19c092 100644
--- a/libvlc/jni/modules/demuxdump2.c
+++ b/libvlc/jni/modules/demuxdump2.c
@@ -114,7 +114,7 @@ static int Open(vlc_object_t * p_this)
demux_t *p_demux = (demux_t*)p_this;
/* Accept only if forced */
- if (!p_demux->b_force)
+ if (!p_demux->obj.force)
return VLC_EGENERIC;
char *psz_path = var_InheritString(p_demux, "demuxdump-file");
More information about the Android
mailing list