From 20597b3632d3b6e25ba532716106f90d5b64d0e8 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 28 Oct 2013 23:58:17 +0100 Subject: *: use nullptr instead of NULL --- src/decoder/FfmpegMetaData.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/decoder/FfmpegMetaData.cxx') diff --git a/src/decoder/FfmpegMetaData.cxx b/src/decoder/FfmpegMetaData.cxx index 17255f0a4..6e92b4a13 100644 --- a/src/decoder/FfmpegMetaData.cxx +++ b/src/decoder/FfmpegMetaData.cxx @@ -32,7 +32,7 @@ static const struct tag_table ffmpeg_tags[] = { { "album_artist-sort", TAG_ALBUM_ARTIST_SORT }, /* sentinel */ - { NULL, TAG_NUM_OF_ITEM_TYPES } + { nullptr, TAG_NUM_OF_ITEM_TYPES } }; static void @@ -40,9 +40,9 @@ ffmpeg_copy_metadata(TagType type, AVDictionary *m, const char *name, const struct tag_handler *handler, void *handler_ctx) { - AVDictionaryEntry *mt = NULL; + AVDictionaryEntry *mt = nullptr; - while ((mt = av_dict_get(m, name, mt, 0)) != NULL) + while ((mt = av_dict_get(m, name, mt, 0)) != nullptr) tag_handler_invoke_tag(handler, handler_ctx, type, mt->value); } @@ -51,9 +51,9 @@ static void ffmpeg_scan_pairs(AVDictionary *dict, const struct tag_handler *handler, void *handler_ctx) { - AVDictionaryEntry *i = NULL; + AVDictionaryEntry *i = nullptr; - while ((i = av_dict_get(dict, "", i, AV_DICT_IGNORE_SUFFIX)) != NULL) + while ((i = av_dict_get(dict, "", i, AV_DICT_IGNORE_SUFFIX)) != nullptr) tag_handler_invoke_pair(handler, handler_ctx, i->key, i->value); } @@ -67,10 +67,10 @@ ffmpeg_scan_dictionary(AVDictionary *dict, handler, handler_ctx); for (const struct tag_table *i = ffmpeg_tags; - i->name != NULL; ++i) + i->name != nullptr; ++i) ffmpeg_copy_metadata(i->type, dict, i->name, handler, handler_ctx); - if (handler->pair != NULL) + if (handler->pair != nullptr) ffmpeg_scan_pairs(dict, handler, handler_ctx); } -- cgit v1.2.3