summaryrefslogtreecommitdiff
path: root/avmedia/source/win/framegrabber.cxx
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-01-31 09:41:59 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2018-01-31 21:01:17 +0100
commitbca11ff008b53764cf248eff485bdb24c41b6fa3 (patch)
tree940db4c9540b9e78b4f1fe2a360a260458a79b90 /avmedia/source/win/framegrabber.cxx
parent453cb4dfa5c563fcfe723a9193246873ebc83b1e (diff)
avmedia: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: I6274d563f9bb4f1f173d0d5d25239e5617ee064c Reviewed-on: https://gerrit.libreoffice.org/48946 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'avmedia/source/win/framegrabber.cxx')
-rw-r--r--avmedia/source/win/framegrabber.cxx7
1 files changed, 0 insertions, 7 deletions
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index aa270660a7f4..fb0369d7c8cc 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -21,10 +21,6 @@
#include <memory>
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#pragma warning(disable: 4917)
-#endif
#include <prewin.h>
#include <postwin.h>
#include <objbase.h>
@@ -32,9 +28,6 @@
#include <Amvideo.h>
#include "interface.hxx"
#include <uuids.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
#include "framegrabber.hxx"
#include "player.hxx"