diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-01-25 23:54:12 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-01-25 23:54:12 +0300 |
| commit | 311d1072ecdb7c7d83d8d569677296db5360d3c7 (patch) | |
| tree | d58a07ba97e923c770f494af23e6e40abc37bee0 /decoder | |
| parent | 00229f58e3d03cca608b57a60e4e73283f24f283 (diff) | |
Silence warnings from ffmpeg includes
Diffstat (limited to 'decoder')
| -rw-r--r-- | decoder/LAVAudio/LAVAudio.cpp | 4 | ||||
| -rw-r--r-- | decoder/LAVAudio/parser/dts.cpp | 2 | ||||
| -rw-r--r-- | decoder/LAVVideo/parsers/MPEG2HeaderParser.cpp | 3 | ||||
| -rw-r--r-- | decoder/LAVVideo/parsers/VC1HeaderParser.cpp | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/decoder/LAVAudio/LAVAudio.cpp b/decoder/LAVAudio/LAVAudio.cpp index cc211591..6018e5b2 100644 --- a/decoder/LAVAudio/LAVAudio.cpp +++ b/decoder/LAVAudio/LAVAudio.cpp @@ -34,6 +34,9 @@ #include "DeCSS/DeCSSInputPin.h" +#pragma warning( push ) +#pragma warning( disable : 4018 ) +#pragma warning( disable : 4101 ) extern "C" { #define AVCODEC_X86_MATHOPS_H #include "libavformat/spdif.h" @@ -43,6 +46,7 @@ extern int ff_vorbis_comment(AVFormatContext *ms, AVDictionary **m, const uint8_ extern void ff_rm_reorder_sipr_data(uint8_t *buf, int sub_packet_h, int framesize); __declspec(dllimport) extern const unsigned char ff_sipr_subpk_size[4]; }; +#pragma warning( pop ) #ifdef DEBUG #include "lavf_log.h" diff --git a/decoder/LAVAudio/parser/dts.cpp b/decoder/LAVAudio/parser/dts.cpp index b1c0382d..444cbe97 100644 --- a/decoder/LAVAudio/parser/dts.cpp +++ b/decoder/LAVAudio/parser/dts.cpp @@ -24,7 +24,7 @@ extern "C" { #pragma warning( push ) -#pragma warning( disable : 4018 ) +#pragma warning( disable : 4101 ) #pragma warning( disable : 4244 ) #pragma warning( disable : 4305 ) #define FF_API_PIX_FMT 0 diff --git a/decoder/LAVVideo/parsers/MPEG2HeaderParser.cpp b/decoder/LAVVideo/parsers/MPEG2HeaderParser.cpp index a835ff55..34a5ce83 100644 --- a/decoder/LAVVideo/parsers/MPEG2HeaderParser.cpp +++ b/decoder/LAVVideo/parsers/MPEG2HeaderParser.cpp @@ -21,8 +21,7 @@ #include "MPEG2HeaderParser.h" #pragma warning( push ) -#pragma warning( disable : 4018 ) -#pragma warning( disable : 4244 ) +#pragma warning( disable : 4101 ) #define AVCODEC_X86_MATHOPS_H #include "libavcodec/get_bits.h" #pragma warning( pop ) diff --git a/decoder/LAVVideo/parsers/VC1HeaderParser.cpp b/decoder/LAVVideo/parsers/VC1HeaderParser.cpp index 699a37ba..eb48ff7a 100644 --- a/decoder/LAVVideo/parsers/VC1HeaderParser.cpp +++ b/decoder/LAVVideo/parsers/VC1HeaderParser.cpp @@ -21,8 +21,7 @@ #include "VC1HeaderParser.h" #pragma warning( push ) -#pragma warning( disable : 4018 ) -#pragma warning( disable : 4244 ) +#pragma warning( disable : 4101 ) extern "C" { #define AVCODEC_X86_MATHOPS_H #include "libavcodec/get_bits.h" |