Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
d894b1b5
Commit
d894b1b5
authored
Jan 07, 2009
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added apple subtitle support to mov demuxer (close #2376).
parent
16c4c21a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
1 deletion
+4
-1
modules/demux/mp4/libmp4.c
modules/demux/mp4/libmp4.c
+2
-1
modules/demux/mp4/libmp4.h
modules/demux/mp4/libmp4.h
+1
-0
modules/demux/mp4/mp4.c
modules/demux/mp4/mp4.c
+1
-0
No files found.
modules/demux/mp4/libmp4.c
View file @
d894b1b5
...
...
@@ -1438,7 +1438,7 @@ static int MP4_ReadBox_sample_tx3g( stream_t *p_stream, MP4_Box_t *p_box )
MP4_GET2BYTES
(
p_box
->
data
.
p_sample_text
->
i_text_box_right
);
#ifdef MP4_VERBOSE
msg_Dbg
(
p_stream
,
"read box:
\"
t
ext
\"
in stsd text"
);
msg_Dbg
(
p_stream
,
"read box:
\"
t
x3g
\"
in stsd text"
);
#endif
MP4_READBOX_EXIT
(
1
);
}
...
...
@@ -2446,6 +2446,7 @@ static int MP4_ReadBox_default( stream_t *p_stream, MP4_Box_t *p_box )
case
FOURCC_text
:
return
MP4_ReadBox_sample_text
(
p_stream
,
p_box
);
case
FOURCC_tx3g
:
case
FOURCC_sbtl
:
return
MP4_ReadBox_sample_tx3g
(
p_stream
,
p_box
);
default:
msg_Warn
(
p_stream
,
...
...
modules/demux/mp4/libmp4.h
View file @
d894b1b5
...
...
@@ -187,6 +187,7 @@
#define FOURCC_text VLC_FOURCC( 't', 'e', 'x', 't' )
#define FOURCC_tx3g VLC_FOURCC( 't', 'x', '3', 'g' )
#define FOURCC_subp VLC_FOURCC( 's', 'u', 'b', 'p' )
#define FOURCC_sbtl VLC_FOURCC( 's', 'b', 't', 'l' )
#define FOURCC_0xa9nam VLC_FOURCC( 0xa9, 'n', 'a', 'm' )
#define FOURCC_0xa9aut VLC_FOURCC( 0xa9, 'a', 'u', 't' )
...
...
modules/demux/mp4/mp4.c
View file @
d894b1b5
...
...
@@ -2124,6 +2124,7 @@ static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track,
case
(
FOURCC_text
):
case
(
FOURCC_subp
):
case
(
FOURCC_tx3g
):
case
(
FOURCC_sbtl
):
p_track
->
fmt
.
i_cat
=
SPU_ES
;
break
;
...
...
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