trimを使用するとエラー終了してしまうのを修正。1497412a のバグ。

rigaya · Mar 13, 2018 · 5050217 · 5050217
1 parent 1675b77
commit 5050217
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/NVEncCore/rgy_input_avcodec.cpp b/NVEncCore/rgy_input_avcodec.cpp
@@ -1481,7 +1481,7 @@ int RGYInputAvcodec::getSample(AVPacket *pkt, bool bTreatFirstPacketAsKeyframe)
         }
     }
     //ファイルの終わりに到達
-    if (ret_read_frame != AVERROR_EOF) {
+    if (ret_read_frame != AVERROR_EOF && ret_read_frame < 0) {
         AddMessage(RGY_LOG_ERROR, _T("error occured while reading file: %d frames, %s\n"), m_Demux.frames.frameNum(), qsv_av_err2str(ret_read_frame).c_str());
         return 1;
     }

diff --git a/NVEncCore/rgy_version.h b/NVEncCore/rgy_version.h
@@ -29,9 +29,9 @@
 #ifndef __RGY_CONFIG_H__
 #define __RGY_CONFIG_H__
 
-#define VER_FILEVERSION              0,3,32,0
-#define VER_STR_FILEVERSION          "3.32"
-#define VER_STR_FILEVERSION_TCHAR _T("3.32")
+#define VER_FILEVERSION              0,3,33,0
+#define VER_STR_FILEVERSION          "3.33"
+#define VER_STR_FILEVERSION_TCHAR _T("3.33")
 
 #ifdef _M_IX86
 #define BUILD_ARCH_STR _T("x86")