diff options
| author | Christian Strømme <christian.stromme@theqtcompany.com> | 2016-01-15 17:27:32 +0100 |
|---|---|---|
| committer | Christian Strømme <christian.stromme@theqtcompany.com> | 2016-01-15 17:28:17 +0100 |
| commit | 84e426c3af2a3bb1b7f916e54263aea758db38d0 (patch) | |
| tree | 4fe09a8da5b15ba466e5771239d06f29a6c123da /src/multimedia/video | |
| parent | 84aaa48fdfc1f35c9870518a3d4b6f08a1f99449 (diff) | |
| parent | 924dc7f48c7003b46079623738ae531f34aed903 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
src/plugins/wmf/mftvideo.cpp
Change-Id: I78868b416ea4baec89ca3e2dc9eb4712db16d5fc
Diffstat (limited to 'src/multimedia/video')
| -rw-r--r-- | src/multimedia/video/qvideoframeconversionhelper_p.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/multimedia/video/qvideoframeconversionhelper_p.h b/src/multimedia/video/qvideoframeconversionhelper_p.h index eead17a91..10e9d3ab3 100644 --- a/src/multimedia/video/qvideoframeconversionhelper_p.h +++ b/src/multimedia/video/qvideoframeconversionhelper_p.h @@ -34,6 +34,17 @@ #ifndef QVIDEOFRAMECONVERSIONHELPER_P_H #define QVIDEOFRAMECONVERSIONHELPER_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <qvideoframe.h> #include <private/qsimd_p.h> |