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
1c64bae6
Commit
1c64bae6
authored
Jun 19, 2017
by
John Stebbins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
movenc: move tags definitions to where they are used
parent
f6f86f43
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
31 deletions
+31
-31
movenc.c
libavformat/movenc.c
+31
-31
No files found.
libavformat/movenc.c
View file @
1c64bae6
...
...
@@ -779,17 +779,6 @@ static int mov_write_avid_tag(AVIOContext *pb, MOVTrack *track)
return
0
;
}
static
const
AVCodecTag
codec_ipod_tags
[]
=
{
{
AV_CODEC_ID_H264
,
MKTAG
(
'a'
,
'v'
,
'c'
,
'1'
)
},
{
AV_CODEC_ID_MPEG4
,
MKTAG
(
'm'
,
'p'
,
'4'
,
'v'
)
},
{
AV_CODEC_ID_AAC
,
MKTAG
(
'm'
,
'p'
,
'4'
,
'a'
)
},
{
AV_CODEC_ID_ALAC
,
MKTAG
(
'a'
,
'l'
,
'a'
,
'c'
)
},
{
AV_CODEC_ID_AC3
,
MKTAG
(
'a'
,
'c'
,
'-'
,
'3'
)
},
{
AV_CODEC_ID_MOV_TEXT
,
MKTAG
(
't'
,
'x'
,
'3'
,
'g'
)
},
{
AV_CODEC_ID_MOV_TEXT
,
MKTAG
(
't'
,
'e'
,
'x'
,
't'
)
},
{
AV_CODEC_ID_NONE
,
0
},
};
static
int
mov_get_dv_codec_tag
(
AVFormatContext
*
s
,
MOVTrack
*
track
)
{
int
tag
;
...
...
@@ -890,26 +879,6 @@ static int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track)
return
tag
;
}
static
const
AVCodecTag
codec_3gp_tags
[]
=
{
{
AV_CODEC_ID_H263
,
MKTAG
(
's'
,
'2'
,
'6'
,
'3'
)
},
{
AV_CODEC_ID_H264
,
MKTAG
(
'a'
,
'v'
,
'c'
,
'1'
)
},
{
AV_CODEC_ID_MPEG4
,
MKTAG
(
'm'
,
'p'
,
'4'
,
'v'
)
},
{
AV_CODEC_ID_AAC
,
MKTAG
(
'm'
,
'p'
,
'4'
,
'a'
)
},
{
AV_CODEC_ID_AMR_NB
,
MKTAG
(
's'
,
'a'
,
'm'
,
'r'
)
},
{
AV_CODEC_ID_AMR_WB
,
MKTAG
(
's'
,
'a'
,
'w'
,
'b'
)
},
{
AV_CODEC_ID_MOV_TEXT
,
MKTAG
(
't'
,
'x'
,
'3'
,
'g'
)
},
{
AV_CODEC_ID_NONE
,
0
},
};
static
const
AVCodecTag
codec_f4v_tags
[]
=
{
{
AV_CODEC_ID_MP3
,
MKTAG
(
'.'
,
'm'
,
'p'
,
'3'
)
},
{
AV_CODEC_ID_AAC
,
MKTAG
(
'm'
,
'p'
,
'4'
,
'a'
)
},
{
AV_CODEC_ID_H264
,
MKTAG
(
'a'
,
'v'
,
'c'
,
'1'
)
},
{
AV_CODEC_ID_VP6A
,
MKTAG
(
'V'
,
'P'
,
'6'
,
'A'
)
},
{
AV_CODEC_ID_VP6F
,
MKTAG
(
'V'
,
'P'
,
'6'
,
'F'
)
},
{
AV_CODEC_ID_NONE
,
0
},
};
static
int
mov_find_codec_tag
(
AVFormatContext
*
s
,
MOVTrack
*
track
)
{
int
tag
;
...
...
@@ -4410,6 +4379,17 @@ error:
return
res
;
}
static
const
AVCodecTag
codec_3gp_tags
[]
=
{
{
AV_CODEC_ID_H263
,
MKTAG
(
's'
,
'2'
,
'6'
,
'3'
)
},
{
AV_CODEC_ID_H264
,
MKTAG
(
'a'
,
'v'
,
'c'
,
'1'
)
},
{
AV_CODEC_ID_MPEG4
,
MKTAG
(
'm'
,
'p'
,
'4'
,
'v'
)
},
{
AV_CODEC_ID_AAC
,
MKTAG
(
'm'
,
'p'
,
'4'
,
'a'
)
},
{
AV_CODEC_ID_AMR_NB
,
MKTAG
(
's'
,
'a'
,
'm'
,
'r'
)
},
{
AV_CODEC_ID_AMR_WB
,
MKTAG
(
's'
,
'a'
,
'w'
,
'b'
)
},
{
AV_CODEC_ID_MOV_TEXT
,
MKTAG
(
't'
,
'x'
,
'3'
,
'g'
)
},
{
AV_CODEC_ID_NONE
,
0
},
};
const
AVCodecTag
codec_mp4_tags
[]
=
{
{
AV_CODEC_ID_MPEG4
,
MKTAG
(
'm'
,
'p'
,
'4'
,
'v'
)
},
{
AV_CODEC_ID_H264
,
MKTAG
(
'a'
,
'v'
,
'c'
,
'1'
)
},
...
...
@@ -4440,6 +4420,26 @@ const AVCodecTag codec_ism_tags[] = {
{
AV_CODEC_ID_NONE
,
0
},
};
static
const
AVCodecTag
codec_ipod_tags
[]
=
{
{
AV_CODEC_ID_H264
,
MKTAG
(
'a'
,
'v'
,
'c'
,
'1'
)
},
{
AV_CODEC_ID_MPEG4
,
MKTAG
(
'm'
,
'p'
,
'4'
,
'v'
)
},
{
AV_CODEC_ID_AAC
,
MKTAG
(
'm'
,
'p'
,
'4'
,
'a'
)
},
{
AV_CODEC_ID_ALAC
,
MKTAG
(
'a'
,
'l'
,
'a'
,
'c'
)
},
{
AV_CODEC_ID_AC3
,
MKTAG
(
'a'
,
'c'
,
'-'
,
'3'
)
},
{
AV_CODEC_ID_MOV_TEXT
,
MKTAG
(
't'
,
'x'
,
'3'
,
'g'
)
},
{
AV_CODEC_ID_MOV_TEXT
,
MKTAG
(
't'
,
'e'
,
'x'
,
't'
)
},
{
AV_CODEC_ID_NONE
,
0
},
};
static
const
AVCodecTag
codec_f4v_tags
[]
=
{
{
AV_CODEC_ID_MP3
,
MKTAG
(
'.'
,
'm'
,
'p'
,
'3'
)
},
{
AV_CODEC_ID_AAC
,
MKTAG
(
'm'
,
'p'
,
'4'
,
'a'
)
},
{
AV_CODEC_ID_H264
,
MKTAG
(
'a'
,
'v'
,
'c'
,
'1'
)
},
{
AV_CODEC_ID_VP6A
,
MKTAG
(
'V'
,
'P'
,
'6'
,
'A'
)
},
{
AV_CODEC_ID_VP6F
,
MKTAG
(
'V'
,
'P'
,
'6'
,
'F'
)
},
{
AV_CODEC_ID_NONE
,
0
},
};
#if CONFIG_MOV_MUXER
MOV_CLASS
(
mov
)
AVOutputFormat
ff_mov_muxer
=
{
...
...
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