Commit 5e3f3b04 authored by Max Kellermann's avatar Max Kellermann

decoder/ffpmeg: rename functions to CamelCase

parent 923c402f
...@@ -711,11 +711,11 @@ ffmpeg_scan_stream(InputStream &is, ...@@ -711,11 +711,11 @@ ffmpeg_scan_stream(InputStream &is,
tag_handler_invoke_duration(handler, handler_ctx, duration); tag_handler_invoke_duration(handler, handler_ctx, duration);
} }
ffmpeg_scan_dictionary(f->metadata, handler, handler_ctx); FfmpegScanDictionary(f->metadata, handler, handler_ctx);
int idx = ffmpeg_find_audio_stream(*f); int idx = ffmpeg_find_audio_stream(*f);
if (idx >= 0) if (idx >= 0)
ffmpeg_scan_dictionary(f->streams[idx]->metadata, FfmpegScanDictionary(f->streams[idx]->metadata,
handler, handler_ctx); handler, handler_ctx);
avformat_close_input(&f); avformat_close_input(&f);
return true; return true;
......
...@@ -36,9 +36,9 @@ static const struct tag_table ffmpeg_tags[] = { ...@@ -36,9 +36,9 @@ static const struct tag_table ffmpeg_tags[] = {
}; };
static void static void
ffmpeg_copy_metadata(TagType type, FfmpegScanTag(TagType type,
AVDictionary *m, const char *name, AVDictionary *m, const char *name,
const struct tag_handler *handler, void *handler_ctx) const struct tag_handler *handler, void *handler_ctx)
{ {
AVDictionaryEntry *mt = nullptr; AVDictionaryEntry *mt = nullptr;
...@@ -48,8 +48,8 @@ ffmpeg_copy_metadata(TagType type, ...@@ -48,8 +48,8 @@ ffmpeg_copy_metadata(TagType type,
} }
static void static void
ffmpeg_scan_pairs(AVDictionary *dict, FfmpegScanPairs(AVDictionary *dict,
const struct tag_handler *handler, void *handler_ctx) const struct tag_handler *handler, void *handler_ctx)
{ {
AVDictionaryEntry *i = nullptr; AVDictionaryEntry *i = nullptr;
...@@ -59,20 +59,20 @@ ffmpeg_scan_pairs(AVDictionary *dict, ...@@ -59,20 +59,20 @@ ffmpeg_scan_pairs(AVDictionary *dict,
} }
void void
ffmpeg_scan_dictionary(AVDictionary *dict, FfmpegScanDictionary(AVDictionary *dict,
const struct tag_handler *handler, void *handler_ctx) const struct tag_handler *handler, void *handler_ctx)
{ {
if (handler->tag != nullptr) { if (handler->tag != nullptr) {
for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; ++i) for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; ++i)
ffmpeg_copy_metadata(TagType(i), dict, tag_item_names[i], FfmpegScanTag(TagType(i), dict, tag_item_names[i],
handler, handler_ctx); handler, handler_ctx);
for (const struct tag_table *i = ffmpeg_tags; for (const struct tag_table *i = ffmpeg_tags;
i->name != nullptr; ++i) i->name != nullptr; ++i)
ffmpeg_copy_metadata(i->type, dict, i->name, FfmpegScanTag(i->type, dict, i->name,
handler, handler_ctx); handler, handler_ctx);
} }
if (handler->pair != nullptr) if (handler->pair != nullptr)
ffmpeg_scan_pairs(dict, handler, handler_ctx); FfmpegScanPairs(dict, handler, handler_ctx);
} }
...@@ -32,7 +32,7 @@ extern "C" { ...@@ -32,7 +32,7 @@ extern "C" {
struct tag_handler; struct tag_handler;
void void
ffmpeg_scan_dictionary(AVDictionary *dict, FfmpegScanDictionary(AVDictionary *dict,
const tag_handler *handler, void *handler_ctx); const tag_handler *handler, void *handler_ctx);
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment