Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
708c6ce4
Commit
708c6ce4
authored
Oct 14, 2015
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: mp4: s/file/media
parent
590be7db
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
modules/demux/mp4/mp4.c
modules/demux/mp4/mp4.c
+8
-8
No files found.
modules/demux/mp4/mp4.c
View file @
708c6ce4
...
@@ -612,14 +612,14 @@ static int Open( vlc_object_t * p_this )
...
@@ -612,14 +612,14 @@ static int Open( vlc_object_t * p_this )
{
{
case
MAJOR_isom
:
case
MAJOR_isom
:
msg_Dbg
(
p_demux
,
msg_Dbg
(
p_demux
,
"ISO Media
file
(isom) version %d."
,
"ISO Media (isom) version %d."
,
BOXDATA
(
p_ftyp
)
->
i_minor_version
);
BOXDATA
(
p_ftyp
)
->
i_minor_version
);
break
;
break
;
case
MAJOR_3gp4
:
case
MAJOR_3gp4
:
case
MAJOR_3gp5
:
case
MAJOR_3gp5
:
case
MAJOR_3gp6
:
case
MAJOR_3gp6
:
case
MAJOR_3gp7
:
case
MAJOR_3gp7
:
msg_Dbg
(
p_demux
,
"3GPP Media
file
Release: %c"
,
msg_Dbg
(
p_demux
,
"3GPP Media Release: %c"
,
#ifdef WORDS_BIGENDIAN
#ifdef WORDS_BIGENDIAN
BOXDATA
(
p_ftyp
)
->
i_major_brand
BOXDATA
(
p_ftyp
)
->
i_major_brand
#else
#else
...
@@ -628,17 +628,17 @@ static int Open( vlc_object_t * p_this )
...
@@ -628,17 +628,17 @@ static int Open( vlc_object_t * p_this )
);
);
break
;
break
;
case
MAJOR_qt__
:
case
MAJOR_qt__
:
msg_Dbg
(
p_demux
,
"Apple QuickTime
file
"
);
msg_Dbg
(
p_demux
,
"Apple QuickTime
media
"
);
break
;
break
;
case
MAJOR_isml
:
case
MAJOR_isml
:
msg_Dbg
(
p_demux
,
"PIFF (= isml = fMP4)
file
"
);
msg_Dbg
(
p_demux
,
"PIFF (= isml = fMP4)
media
"
);
break
;
break
;
case
MAJOR_dash
:
case
MAJOR_dash
:
msg_Dbg
(
p_demux
,
"DASH Stream
file
"
);
msg_Dbg
(
p_demux
,
"DASH Stream"
);
break
;
break
;
default:
default:
msg_Dbg
(
p_demux
,
msg_Dbg
(
p_demux
,
"unrecognized major
file
specification (%4.4s)."
,
"unrecognized major
media
specification (%4.4s)."
,
(
char
*
)
&
BOXDATA
(
p_ftyp
)
->
i_major_brand
);
(
char
*
)
&
BOXDATA
(
p_ftyp
)
->
i_major_brand
);
break
;
break
;
}
}
...
@@ -647,13 +647,13 @@ static int Open( vlc_object_t * p_this )
...
@@ -647,13 +647,13 @@ static int Open( vlc_object_t * p_this )
{
{
if
(
BOXDATA
(
p_ftyp
)
->
i_compatible_brands
[
i
]
==
MAJOR_dash
)
if
(
BOXDATA
(
p_ftyp
)
->
i_compatible_brands
[
i
]
==
MAJOR_dash
)
{
{
msg_Dbg
(
p_demux
,
"DASH Stream
file
"
);
msg_Dbg
(
p_demux
,
"DASH Stream"
);
}
}
}
}
}
}
else
else
{
{
msg_Dbg
(
p_demux
,
"file type box missing (assuming ISO Media
file
)"
);
msg_Dbg
(
p_demux
,
"file type box missing (assuming ISO Media)"
);
}
}
if
(
MP4_BoxCount
(
p_sys
->
p_root
,
"/moov/mvex"
)
>
0
)
if
(
MP4_BoxCount
(
p_sys
->
p_root
,
"/moov/mvex"
)
>
0
)
...
...
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