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
ccba88d7
Commit
ccba88d7
authored
Mar 24, 2007
by
Baptiste Coudurier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cosmectics, mov -> mp4
Originally committed as revision 8497 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
295b7dc3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
isom.c
libavformat/isom.c
+1
-1
isom.h
libavformat/isom.h
+1
-1
mov.c
libavformat/mov.c
+1
-1
movenc.c
libavformat/movenc.c
+1
-1
No files found.
libavformat/isom.c
View file @
ccba88d7
...
...
@@ -26,7 +26,7 @@
#include "isom.h"
/* http://www.mp4ra.org */
const
AVCodecTag
ff_m
ov
_obj_type
[]
=
{
const
AVCodecTag
ff_m
p4
_obj_type
[]
=
{
{
CODEC_ID_MPEG4
,
32
},
{
CODEC_ID_H264
,
33
},
{
CODEC_ID_AAC
,
64
},
...
...
libavformat/isom.h
View file @
ccba88d7
...
...
@@ -25,7 +25,7 @@
#define FFMPEG_ISOM_H
/* isom.c */
extern
const
AVCodecTag
ff_m
ov
_obj_type
[];
extern
const
AVCodecTag
ff_m
p4
_obj_type
[];
extern
const
AVCodecTag
codec_movvideo_tags
[];
extern
const
AVCodecTag
codec_movaudio_tags
[];
...
...
libavformat/mov.c
View file @
ccba88d7
...
...
@@ -382,7 +382,7 @@ static int mov_read_esds(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
sc
->
esds
.
max_bitrate
=
get_be32
(
pb
);
sc
->
esds
.
avg_bitrate
=
get_be32
(
pb
);
st
->
codec
->
codec_id
=
codec_get_id
(
ff_m
ov
_obj_type
,
sc
->
esds
.
object_type_id
);
st
->
codec
->
codec_id
=
codec_get_id
(
ff_m
p4
_obj_type
,
sc
->
esds
.
object_type_id
);
dprintf
(
c
->
fc
,
"esds object type id %d
\n
"
,
sc
->
esds
.
object_type_id
);
len
=
mov_mp4_read_descr
(
c
,
pb
,
&
tag
);
if
(
tag
==
MP4DecSpecificDescrTag
)
{
...
...
libavformat/movenc.c
View file @
ccba88d7
...
...
@@ -260,7 +260,7 @@ static int mov_write_esds_tag(ByteIOContext *pb, MOVTrack* track) // Basic
putDescr
(
pb
,
0x04
,
13
+
decoderSpecificInfoLen
);
// Object type indication
put_byte
(
pb
,
codec_get_tag
(
ff_m
ov
_obj_type
,
track
->
enc
->
codec_id
));
put_byte
(
pb
,
codec_get_tag
(
ff_m
p4
_obj_type
,
track
->
enc
->
codec_id
));
// the following fields is made of 6 bits to identify the streamtype (4 for video, 5 for audio)
// plus 1 bit to indicate upstream and 1 bit set to 1 (reserved)
...
...
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