[Libreoffice-commits] core.git: avmedia/source solenv/clang-format
Philipp Hofer (via logerrit)
logerrit at kemper.freedesktop.org
Fri Nov 13 07:10:52 UTC 2020
avmedia/source/inc/mediamisc.hxx | 8 ++++----
solenv/clang-format/excludelist | 1 -
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit e05af8af958c9caa4bb7a4f6d8600ddf0a22c54b
Author: Philipp Hofer <philipp.hofer at protonmail.com>
AuthorDate: Thu Nov 12 12:47:49 2020 +0100
Commit: Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Fri Nov 13 08:10:09 2020 +0100
tdf#123936 Formatting files in module avmedia with clang-format
Change-Id: I66738a8bb23bb547249aa74f1f710b76bd7df516
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105643
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx
index 504a136aa5ce..71bce74e3d28 100644
--- a/avmedia/source/inc/mediamisc.hxx
+++ b/avmedia/source/inc/mediamisc.hxx
@@ -23,19 +23,19 @@
#define AVMEDIA_MANAGER_SERVICE_PREFERRED "com.sun.star.comp.avmedia.Manager_VLC"
#ifdef _WIN32
-#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_DirectX"
+#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_DirectX"
#else
#ifdef MACOSX
-#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_MacAVF"
+#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_MacAVF"
#else
-#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_GStreamer"
+#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_GStreamer"
#endif
#endif
#define AVMEDIA_OPENGL_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_OpenGL"
// Mime types
-#define AVMEDIA_MIMETYPE_COMMON "application/vnd.sun.star.media"
+#define AVMEDIA_MIMETYPE_COMMON "application/vnd.sun.star.media"
inline OUString AvmResId(const char* pId)
{
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index e0379086f6ea..40bf78f00e65 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -156,7 +156,6 @@ avmedia/source/gstreamer/gstplayer.cxx
avmedia/source/gstreamer/gstplayer.hxx
avmedia/source/gstreamer/gstwindow.cxx
avmedia/source/gstreamer/gstwindow.hxx
-avmedia/source/inc/mediamisc.hxx
avmedia/source/macavf/framegrabber.hxx
avmedia/source/macavf/macavfcommon.hxx
avmedia/source/macavf/manager.hxx
More information about the Libreoffice-commits
mailing list