Skip to content

Commit

Permalink
警告つぶし。
Browse files Browse the repository at this point in the history
  • Loading branch information
rigaya committed Nov 24, 2018
1 parent c49adc6 commit 71129b6
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
1 change: 1 addition & 0 deletions QSVPipeline/rgy_input_avcodec.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -694,6 +694,7 @@ RGY_ERR RGYInputAvcodec::getFirstFramePosAndFrameRate(const sTrim *pTrimList, in

#pragma warning(push)
#pragma warning(disable:4100)
#pragma warning(disable:4127) //warning C4127: 条件式が定数です。
RGY_ERR RGYInputAvcodec::Init(const TCHAR *strFileName, VideoInfo *pInputInfo, const void *prm) {
const AvcodecReaderPrm *input_prm = (const AvcodecReaderPrm *)prm;

Expand Down
3 changes: 3 additions & 0 deletions QSVPipeline/rgy_input_avs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ RGY_ERR RGYInputAvs::load_avisynth() {
return RGY_ERR_NONE;
}

#pragma warning(push)
#pragma warning(disable:4127) //warning C4127: 条件式が定数です。
RGY_ERR RGYInputAvs::Init(const TCHAR *strFileName, VideoInfo *pInputInfo, const void *prm) {
UNREFERENCED_PARAMETER(prm);
memcpy(&m_inputVideoInfo, pInputInfo, sizeof(m_inputVideoInfo));
Expand Down Expand Up @@ -264,6 +266,7 @@ RGY_ERR RGYInputAvs::Init(const TCHAR *strFileName, VideoInfo *pInputInfo, const
*pInputInfo = m_inputVideoInfo;
return RGY_ERR_NONE;
}
#pragma warning(pop)

void RGYInputAvs::Close() {
AddMessage(RGY_LOG_DEBUG, _T("Closing...\n"));
Expand Down
3 changes: 3 additions & 0 deletions QSVPipeline/rgy_input_vpy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ int RGYInputVpy::getRevInfo(const char *vsVersionString) {
return 0;
}

#pragma warning(push)
#pragma warning(disable:4127) //warning C4127: 条件式が定数です。
RGY_ERR RGYInputVpy::Init(const TCHAR *strFileName, VideoInfo *pInputInfo, const void *prm) {
UNREFERENCED_PARAMETER(prm);
memcpy(&m_inputVideoInfo, pInputInfo, sizeof(m_inputVideoInfo));
Expand Down Expand Up @@ -324,6 +326,7 @@ RGY_ERR RGYInputVpy::Init(const TCHAR *strFileName, VideoInfo *pInputInfo, const
*pInputInfo = m_inputVideoInfo;
return RGY_ERR_NONE;
}
#pragma warning(pop)

void RGYInputVpy::Close() {
AddMessage(RGY_LOG_DEBUG, _T("Closing...\n"));
Expand Down
6 changes: 3 additions & 3 deletions QSVPipeline/rgy_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@

#include "rgy_rev.h"

#define VER_FILEVERSION 0,3,11,0
#define VER_STR_FILEVERSION "3.11"
#define VER_STR_FILEVERSION_TCHAR _T("3.11")
#define VER_FILEVERSION 0,3,13,0
#define VER_STR_FILEVERSION "3.13"
#define VER_STR_FILEVERSION_TCHAR _T("3.13")

#ifdef _M_IX86
#define BUILD_ARCH_STR _T("x86")
Expand Down

0 comments on commit 71129b6

Please sign in to comment.