Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
9e40addd
Commit
9e40addd
authored
Apr 21, 2007
by
Baptiste Coudurier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cosmetics: mov_mp4 -> mp4
Originally committed as revision 8773 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
0b07ac42
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
mov.c
libavformat/mov.c
+6
-6
No files found.
libavformat/mov.c
View file @
9e40addd
...
...
@@ -254,7 +254,7 @@ static int mov_read_hdlr(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
return
0
;
}
static
int
m
ov_m
p4_read_descr_len
(
ByteIOContext
*
pb
)
static
int
mp4_read_descr_len
(
ByteIOContext
*
pb
)
{
int
len
=
0
;
int
count
=
4
;
...
...
@@ -267,11 +267,11 @@ static int mov_mp4_read_descr_len(ByteIOContext *pb)
return
len
;
}
static
int
m
ov_m
p4_read_descr
(
MOVContext
*
c
,
ByteIOContext
*
pb
,
int
*
tag
)
static
int
mp4_read_descr
(
MOVContext
*
c
,
ByteIOContext
*
pb
,
int
*
tag
)
{
int
len
;
*
tag
=
get_byte
(
pb
);
len
=
m
ov_m
p4_read_descr_len
(
pb
);
len
=
mp4_read_descr_len
(
pb
);
dprintf
(
c
->
fc
,
"MPEG4 description: tag=0x%02x len=%d
\n
"
,
*
tag
,
len
);
return
len
;
}
...
...
@@ -287,14 +287,14 @@ static int mov_read_esds(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
/* Well, broken but suffisant for some MP4 streams */
get_be32
(
pb
);
/* version + flags */
len
=
m
ov_m
p4_read_descr
(
c
,
pb
,
&
tag
);
len
=
mp4_read_descr
(
c
,
pb
,
&
tag
);
if
(
tag
==
MP4ESDescrTag
)
{
get_be16
(
pb
);
/* ID */
get_byte
(
pb
);
/* priority */
}
else
get_be16
(
pb
);
/* ID */
len
=
m
ov_m
p4_read_descr
(
c
,
pb
,
&
tag
);
len
=
mp4_read_descr
(
c
,
pb
,
&
tag
);
if
(
tag
==
MP4DecConfigDescrTag
)
{
int
object_type_id
=
get_byte
(
pb
);
get_byte
(
pb
);
/* stream type */
...
...
@@ -304,7 +304,7 @@ static int mov_read_esds(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
st
->
codec
->
codec_id
=
codec_get_id
(
ff_mp4_obj_type
,
object_type_id
);
dprintf
(
c
->
fc
,
"esds object type id %d
\n
"
,
object_type_id
);
len
=
m
ov_m
p4_read_descr
(
c
,
pb
,
&
tag
);
len
=
mp4_read_descr
(
c
,
pb
,
&
tag
);
if
(
tag
==
MP4DecSpecificDescrTag
)
{
dprintf
(
c
->
fc
,
"Specific MPEG4 header len=%d
\n
"
,
len
);
st
->
codec
->
extradata
=
av_mallocz
(
len
+
FF_INPUT_BUFFER_PADDING_SIZE
);
...
...
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