Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLC-Android
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
322
Issues
322
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
VideoLAN
VLC-Android
Commits
0f135d64
Commit
0f135d64
authored
Jun 18, 2016
by
Jean-Baptiste Kempf
3
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update libVLC hash and fix compilation
parent
9ef67671
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
compile.sh
compile.sh
+1
-1
libvlc/jni/modules/demuxdump2.c
libvlc/jni/modules/demuxdump2.c
+1
-1
No files found.
compile.sh
View file @
0f135d64
...
@@ -153,7 +153,7 @@ fi
...
@@ -153,7 +153,7 @@ fi
# Fetch VLC source #
# Fetch VLC source #
####################
####################
TESTED_HASH
=
848f58d
TESTED_HASH
=
6c4e9a8
if
[
!
-d
"vlc"
]
;
then
if
[
!
-d
"vlc"
]
;
then
echo
"VLC source not found, cloning"
echo
"VLC source not found, cloning"
git clone git://git.videolan.org/vlc.git vlc
git clone git://git.videolan.org/vlc.git vlc
...
...
libvlc/jni/modules/demuxdump2.c
View file @
0f135d64
...
@@ -114,7 +114,7 @@ static int Open(vlc_object_t * p_this)
...
@@ -114,7 +114,7 @@ static int Open(vlc_object_t * p_this)
demux_t
*
p_demux
=
(
demux_t
*
)
p_this
;
demux_t
*
p_demux
=
(
demux_t
*
)
p_this
;
/* Accept only if forced */
/* Accept only if forced */
if
(
!
p_demux
->
b_
force
)
if
(
!
p_demux
->
obj
.
force
)
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
char
*
psz_path
=
var_InheritString
(
p_demux
,
"demuxdump-file"
);
char
*
psz_path
=
var_InheritString
(
p_demux
,
"demuxdump-file"
);
...
...
Jean-Baptiste Kempf
@jbk
mentioned in commit
ba492676
·
Jul 08, 2016
mentioned in commit
ba492676
mentioned in commit ba492676fcd62bb85057f80e70d6c24564c79c61
Toggle commit list
Thomas Guillem
@tguillem
mentioned in commit
5b999da8
·
Jul 22, 2016
mentioned in commit
5b999da8
mentioned in commit 5b999da862f02aaa7baf1310996dcf1f1e90d091
Toggle commit list
Thomas Guillem
@tguillem
mentioned in commit
128c5716
·
Jul 22, 2016
mentioned in commit
128c5716
mentioned in commit 128c5716d1e32ae35ddd04b378dc247b38c82eb3
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment