Git commit 3762b26d76cf2b5a7b23ba7f221886b7df8d69c5 by Gilles Caulier. Committed on 28/02/2018 at 22:01. Pushed by cgilles into branch 'development/6.0.0'. displatch FFMpeg keywords to Exif and IPTC M +18 -1 libs/dmetadata/dmetadata_ffmpeg.cpp https://commits.kde.org/digikam/3762b26d76cf2b5a7b23ba7f221886b7df8d69c5 diff --git a/libs/dmetadata/dmetadata_ffmpeg.cpp b/libs/dmetadata/dmetadata= _ffmpeg.cpp index 5baa995ab3..2cf2508cbe 100644 --- a/libs/dmetadata/dmetadata_ffmpeg.cpp +++ b/libs/dmetadata/dmetadata_ffmpeg.cpp @@ -39,6 +39,7 @@ #include #include #include +#include = // Local incudes = @@ -320,7 +321,23 @@ bool DMetadata::loadUsingFFmpeg(const QString& filePat= h) = if (entry) { - setXmpTagString("Xmp.video.InfoText", QString::fromUtf8(entry->val= ue)); + QString data =3D QString::fromUtf8(entry->value); + setXmpTagString("Xmp.video.InfoText", data); + + QStringList keywords =3D data.split(QLatin1String("/")); + = + if (keywords.isEmpty()) + { + keywords =3D data.split(QLatin1String(",")); + = + if (keywords.isEmpty()) + { + keywords =3D data.split(QLatin1String(" ")); + } + } + = + if (!keywords.isEmpty()) + setXmpKeywords(keywords); } = // --------------