Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
167a895e
Commit
167a895e
authored
Jul 11, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MP4: recognize 3gp4 brand in debug
3gp4 is not compatible to isom, while 5, 6 and 7 should be Ref #4979
parent
bba02007
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
modules/demux/mp4/libmp4.h
modules/demux/mp4/libmp4.h
+1
-0
modules/demux/mp4/mp4.c
modules/demux/mp4/mp4.c
+3
-0
No files found.
modules/demux/mp4/libmp4.h
View file @
167a895e
...
@@ -96,6 +96,7 @@
...
@@ -96,6 +96,7 @@
#define FOURCC_rtp VLC_FOURCC( 'r', 't', 'p', ' ' )
#define FOURCC_rtp VLC_FOURCC( 'r', 't', 'p', ' ' )
#define FOURCC_isom VLC_FOURCC( 'i', 's', 'o', 'm' )
#define FOURCC_isom VLC_FOURCC( 'i', 's', 'o', 'm' )
#define FOURCC_3gp4 VLC_FOURCC( '3', 'g', 'p', '4' )
#define FOURCC_esds VLC_FOURCC( 'e', 's', 'd', 's' )
#define FOURCC_esds VLC_FOURCC( 'e', 's', 'd', 's' )
#define FOURCC__mp3 VLC_FOURCC( '.', 'm', 'p', '3' )
#define FOURCC__mp3 VLC_FOURCC( '.', 'm', 'p', '3' )
...
...
modules/demux/mp4/mp4.c
View file @
167a895e
...
@@ -334,6 +334,9 @@ static int Open( vlc_object_t * p_this )
...
@@ -334,6 +334,9 @@ static int Open( vlc_object_t * p_this )
"ISO Media file (isom) version %d."
,
"ISO Media file (isom) version %d."
,
p_ftyp
->
data
.
p_ftyp
->
i_minor_version
);
p_ftyp
->
data
.
p_ftyp
->
i_minor_version
);
break
;
break
;
case
(
FOURCC_3gp4
):
msg_Dbg
(
p_demux
,
"3gp Media file version 4"
);
break
;
default:
default:
msg_Dbg
(
p_demux
,
msg_Dbg
(
p_demux
,
"unrecognized major file specification (%4.4s)."
,
"unrecognized major file specification (%4.4s)."
,
...
...
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