Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
ddb00942
Commit
ddb00942
authored
Nov 21, 2012
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
riff: Make ff_riff_tags static and move under appropriate #ifdef
The table is not used outside the file.
parent
33db40f8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
11 deletions
+11
-11
riff.c
libavformat/riff.c
+11
-11
No files found.
libavformat/riff.c
View file @
ddb00942
...
@@ -367,13 +367,6 @@ const AVMetadataConv ff_riff_info_conv[] = {
...
@@ -367,13 +367,6 @@ const AVMetadataConv ff_riff_info_conv[] = {
{
0
},
{
0
},
};
};
const
char
ff_riff_tags
[][
5
]
=
{
"IARL"
,
"IART"
,
"ICMS"
,
"ICMT"
,
"ICOP"
,
"ICRD"
,
"ICRP"
,
"IDIM"
,
"IDPI"
,
"IENG"
,
"IGNR"
,
"IKEY"
,
"ILGT"
,
"ILNG"
,
"IMED"
,
"INAM"
,
"IPLT"
,
"IPRD"
,
"IPRT"
,
"ISBJ"
,
"ISFT"
,
"ISHP"
,
"ISRC"
,
"ISRF"
,
"ITCH"
,
{
0
}
};
#if CONFIG_MUXERS
#if CONFIG_MUXERS
int64_t
ff_start_tag
(
AVIOContext
*
pb
,
const
char
*
tag
)
int64_t
ff_start_tag
(
AVIOContext
*
pb
,
const
char
*
tag
)
{
{
...
@@ -575,12 +568,19 @@ void ff_riff_write_info_tag(AVIOContext *pb, const char *tag, const char *str)
...
@@ -575,12 +568,19 @@ void ff_riff_write_info_tag(AVIOContext *pb, const char *tag, const char *str)
}
}
}
}
static
const
char
riff_tags
[][
5
]
=
{
"IARL"
,
"IART"
,
"ICMS"
,
"ICMT"
,
"ICOP"
,
"ICRD"
,
"ICRP"
,
"IDIM"
,
"IDPI"
,
"IENG"
,
"IGNR"
,
"IKEY"
,
"ILGT"
,
"ILNG"
,
"IMED"
,
"INAM"
,
"IPLT"
,
"IPRD"
,
"IPRT"
,
"ISBJ"
,
"ISFT"
,
"ISHP"
,
"ISRC"
,
"ISRF"
,
"ITCH"
,
{
0
}
};
static
int
riff_has_valid_tags
(
AVFormatContext
*
s
)
static
int
riff_has_valid_tags
(
AVFormatContext
*
s
)
{
{
int
i
;
int
i
;
for
(
i
=
0
;
*
ff_
riff_tags
[
i
];
i
++
)
{
for
(
i
=
0
;
*
riff_tags
[
i
];
i
++
)
{
if
(
av_dict_get
(
s
->
metadata
,
ff_
riff_tags
[
i
],
NULL
,
AV_DICT_MATCH_CASE
))
if
(
av_dict_get
(
s
->
metadata
,
riff_tags
[
i
],
NULL
,
AV_DICT_MATCH_CASE
))
return
1
;
return
1
;
}
}
...
@@ -602,8 +602,8 @@ void ff_riff_write_info(AVFormatContext *s)
...
@@ -602,8 +602,8 @@ void ff_riff_write_info(AVFormatContext *s)
list_pos
=
ff_start_tag
(
pb
,
"LIST"
);
list_pos
=
ff_start_tag
(
pb
,
"LIST"
);
ffio_wfourcc
(
pb
,
"INFO"
);
ffio_wfourcc
(
pb
,
"INFO"
);
for
(
i
=
0
;
*
ff_
riff_tags
[
i
];
i
++
)
{
for
(
i
=
0
;
*
riff_tags
[
i
];
i
++
)
{
if
((
t
=
av_dict_get
(
s
->
metadata
,
ff_
riff_tags
[
i
],
NULL
,
AV_DICT_MATCH_CASE
)))
if
((
t
=
av_dict_get
(
s
->
metadata
,
riff_tags
[
i
],
NULL
,
AV_DICT_MATCH_CASE
)))
ff_riff_write_info_tag
(
s
->
pb
,
t
->
key
,
t
->
value
);
ff_riff_write_info_tag
(
s
->
pb
,
t
->
key
,
t
->
value
);
}
}
ff_end_tag
(
pb
,
list_pos
);
ff_end_tag
(
pb
,
list_pos
);
...
...
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