Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
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
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
001e2a60
Commit
001e2a60
authored
Feb 03, 2012
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decoder/ffmpeg: add macros emulating AVDictionary
Move the #ifdefs out of _copy_metadata().
parent
f370911c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
13 deletions
+7
-13
ffmpeg_decoder_plugin.c
src/decoder/ffmpeg_decoder_plugin.c
+7
-13
No files found.
src/decoder/ffmpeg_decoder_plugin.c
View file @
001e2a60
...
...
@@ -607,26 +607,20 @@ static const ffmpeg_tag_map ffmpeg_tag_maps[] = {
{
TAG_DISC
,
"disc"
},
};
static
void
ffmpeg_copy_metadata
(
struct
tag
*
tag
,
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,1,0)
AVDictionary
*
m
,
#else
AVMetadata
*
m
,
#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53,1,0)
#define AVDictionary AVMetadata
#define AVDictionaryEntry AVMetadataTag
#define av_dict_get av_metadata_get
#endif
static
void
ffmpeg_copy_metadata
(
struct
tag
*
tag
,
AVDictionary
*
m
,
const
ffmpeg_tag_map
tag_map
)
{
#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,5,0)
AVDictionaryEntry
*
mt
=
NULL
;
while
((
mt
=
av_dict_get
(
m
,
tag_map
.
name
,
mt
,
0
))
!=
NULL
)
tag_add_item
(
tag
,
tag_map
.
type
,
mt
->
value
);
#else
AVMetadataTag
*
mt
=
NULL
;
while
((
mt
=
av_metadata_get
(
m
,
tag_map
.
name
,
mt
,
0
))
!=
NULL
)
tag_add_item
(
tag
,
tag_map
.
type
,
mt
->
value
);
#endif
}
#endif
...
...
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