From e25fc963f7e42a9cf4b55dc58c904d82679a2d31 Mon Sep 17 00:00:00 2001 From: Tristan Matthews Date: Tue, 13 Aug 2013 18:04:11 -0400 Subject: [PATCH] * #28351: libav_utils: use range-based for loops --- daemon/src/video/libav_utils.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/daemon/src/video/libav_utils.cpp b/daemon/src/video/libav_utils.cpp index a70342cad..3cdd1928d 100644 --- a/daemon/src/video/libav_utils.cpp +++ b/daemon/src/video/libav_utils.cpp @@ -58,11 +58,11 @@ void findInstalledVideoCodecs() if (p->type == AVMEDIA_TYPE_VIDEO) libav_codecs.push_back(p->name); - for (map::const_iterator it = encoders_.begin(); it != encoders_.end(); ++it) { - if (std::find(libav_codecs.begin(), libav_codecs.end(), it->second) != libav_codecs.end()) - installed_video_codecs_.push_back(it->first); + for (const auto &it : encoders_) { + if (std::find(libav_codecs.begin(), libav_codecs.end(), it.second) != libav_codecs.end()) + installed_video_codecs_.push_back(it.first); else - ERROR("Didn't find \"%s\" encoder", it->second.c_str()); + ERROR("Didn't find \"%s\" encoder", it.second.c_str()); } } @@ -160,15 +160,14 @@ getDefaultCodecs() const char * const DEFAULT_BITRATE = "400"; sfl_avcodec_init(); std::vector > result; - for (std::vector::const_iterator iter = installed_video_codecs_.begin(); - iter != installed_video_codecs_.end(); ++iter) { + for (const auto &iter : installed_video_codecs_) { std::map codec; // FIXME: get these keys from proper place - codec["name"] = *iter; + codec["name"] = iter; codec["bitrate"] = DEFAULT_BITRATE; codec["enabled"] = "true"; // FIXME: make a nicer version of this - if (*iter == "H264") + if (iter == "H264") codec["parameters"] = DEFAULT_H264_PROFILE_LEVEL_ID; result.push_back(codec); } -- GitLab