Fix for ffmpeg4

pytorch · Jun 1, 2023 · 0f69178 · 0f69178
1 parent db9cc48
commit 0f69178
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/torchaudio/csrc/ffmpeg/libav.cpp b/torchaudio/csrc/ffmpeg/libav.cpp
@@ -3,10 +3,10 @@
 #include <torchaudio/csrc/ffmpeg/libav.h>
 
 extern "C" {
-#include <libavcodec/version_major.h>
-#include <libavdevice/version_major.h>
-#include <libavfilter/version_major.h>
-#include <libavformat/version_major.h>
+#include <libavcodec/version.h>
+#include <libavdevice/version.h>
+#include <libavfilter/version.h>
+#include <libavformat/version.h>
 #include <libavutil/version.h>
 }
 

diff --git a/torchaudio/csrc/ffmpeg/macro.h b/torchaudio/csrc/ffmpeg/macro.h
@@ -1,9 +1,13 @@
 #pragma once
 
 extern "C" {
-#include <libavformat/version_major.h>
+#include <libavformat/version.h>
 }
 
+#ifndef LIBAVFORMAT_VERSION_MAJOR
+#error LIBAVFORMAT_VERSION_MAJOR is not defined.
+#endif
+
 #if LIBAVFORMAT_VERSION_MAJOR >= 59
 #define AVFORMAT_CONST const
 #else