AI/rocm-systems
2
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Actions Packages Projekty Wydania Wiki Aktywność

Revert "FFMPEG 5.X - Support (#268)" (#269)

Przeglądaj źródła 
This reverts commit 4f2bf945a9.
This commit is contained in:
Aryan Salmanpour
2024-02-28 14:31:07 -05:00
zatwierdzone przez GitHub
rodzic 4f2bf945a9
commit 6317b9f22b
6 zmienionych plików z 0 dodań i 28 usunięć
Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files
samples/videoDecode/CMakeLists.txt
-5
Wyświetl plik
@@ -74,11 +74,6 @@ if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND)
include_directories(${AVUTIL_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR}
${AVFORMAT_INCLUDE_DIR})
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${FFMPEG_LIBRARIES})
if(_FFMPEG_AVCODEC_VERSION VERSION_LESS_EQUAL 58.54.100)
target_compile_definitions(${PROJECT_NAME} PUBLIC USE_AVCODEC_58_54=0)
else()
target_compile_definitions(${PROJECT_NAME} PUBLIC USE_AVCODEC_58_54=1)
endif()
# rocDecode
include_directories (${ROCDECODE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCDECODE_LIBRARY})
samples/videoDecodeMem/CMakeLists.txt
-5
Wyświetl plik
@@ -74,11 +74,6 @@ if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND)
include_directories(${AVUTIL_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR}
${AVFORMAT_INCLUDE_DIR})
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${FFMPEG_LIBRARIES})
if(_FFMPEG_AVCODEC_VERSION VERSION_LESS_EQUAL 58.54.100)
target_compile_definitions(${PROJECT_NAME} PUBLIC USE_AVCODEC_58_54=0)
else()
target_compile_definitions(${PROJECT_NAME} PUBLIC USE_AVCODEC_58_54=1)
endif()
# rocDecode
include_directories (${ROCDECODE_INCLUDE_DIR})
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCDECODE_LIBRARY})
samples/videoDecodeMultiFiles/CMakeLists.txt
-5
Wyświetl plik
@@ -74,11 +74,6 @@ if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND)
include_directories(${AVUTIL_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR}
${AVFORMAT_INCLUDE_DIR})
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${FFMPEG_LIBRARIES})
if(_FFMPEG_AVCODEC_VERSION VERSION_LESS_EQUAL 58.54.100)
target_compile_definitions(${PROJECT_NAME} PUBLIC USE_AVCODEC_58_54=0)
else()
target_compile_definitions(${PROJECT_NAME} PUBLIC USE_AVCODEC_58_54=1)
endif()
# rocDecode
include_directories (${ROCDECODE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCDECODE_LIBRARY})
samples/videoDecodePerf/CMakeLists.txt
-5
Wyświetl plik
@@ -74,11 +74,6 @@ if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND AND Threads_FOUND)
include_directories(${AVUTIL_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR}
${SWSCALE_INCLUDE_DIR} ${AVFORMAT_INCLUDE_DIR})
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${FFMPEG_LIBRARIES})
if(_FFMPEG_AVCODEC_VERSION VERSION_LESS_EQUAL 58.54.100)
target_compile_definitions(${PROJECT_NAME} PUBLIC USE_AVCODEC_58_54=0)
else()
target_compile_definitions(${PROJECT_NAME} PUBLIC USE_AVCODEC_58_54=1)
endif()
# rocDecode
include_directories (${ROCDECODE_INCLUDE_DIR})
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCDECODE_LIBRARY})
samples/videoDecodeRGB/CMakeLists.txt
-5
Wyświetl plik
@@ -81,11 +81,6 @@ if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND)
# FFMPEG
include_directories(${AVUTIL_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR})
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${FFMPEG_LIBRARIES})
if(_FFMPEG_AVCODEC_VERSION VERSION_LESS_EQUAL 58.54.100)
target_compile_definitions(${PROJECT_NAME} PUBLIC USE_AVCODEC_58_54=0)
else()
target_compile_definitions(${PROJECT_NAME} PUBLIC USE_AVCODEC_58_54=1)
endif()
# rocDecode and utils
include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../utils ${ROCDECODE_INCLUDE_DIR})
set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCDECODE_LIBRARY})
utils/video_demuxer.h
-3
Wyświetl plik
@@ -26,9 +26,6 @@ THE SOFTWARE.
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
#if USE_AVCODEC_58_54
#include <libavcodec/bsf.h>
#endif
}
#include "rocdecode.h"