Skip to content

Commit 57f71f4

Browse files
committed
decoder: test: cleanup ffmpeg use
1 parent 9194121 commit 57f71f4

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

vk_video_decoder/test/vulkan-video-dec/CMakeLists.txt

+2-4
Original file line numberDiff line numberDiff line change
@@ -67,25 +67,23 @@ link_directories(
6767
)
6868

6969
if(WIN32)
70-
list(APPEND VULKAN_VIDEO_DEC_LIBRARIES PUBLIC ${AVCODEC_LIB} ${AVFORMAT_LIB} ${AVUTIL_LIB})
7170
list(APPEND VULKAN_VIDEO_DEC_LIBRARIES PUBLIC ${VULKAN_VIDEO_PARSER_LIB})
7271
list(APPEND VULKAN_VIDEO_DEC_LIBRARIES PUBLIC ${SHADERC_LIB_SHARED})
7372
list(APPEND VULKAN_VIDEO_DEC_LIBRARIES PUBLIC ${VULKAN_VIDEO_DECODER_LIB})
7473
else()
7574
list(APPEND VULKAN_VIDEO_DEC_LIBRARIES PRIVATE -L${SHADERC_LIB_SHARED_DIR} -l${SHADERC_LIB_SHARED})
7675
list(APPEND VULKAN_VIDEO_DEC_LIBRARIES PRIVATE -L${CMAKE_INSTALL_LIBDIR} -l${VULKAN_VIDEO_DECODER_LIB})
7776
list(APPEND VULKAN_VIDEO_DEC_LIBRARIES PRIVATE -L${LIBVKVIDEODECODER_BINARY_ROOT} -l${VULKAN_VIDEO_DECODER_LIB})
77+
list(APPEND VULKAN_VIDEO_DEC_LIBRARIES PRIVATE -L${LIBNVPARSER_BINARY_ROOT} -L${CMAKE_INSTALL_LIBDIR} -l${VULKAN_VIDEO_PARSER_LIB})
7878
endif()
7979

8080
######## TODO make FFMPEG libraries and demuxer optional. ###################
8181

8282
if(FFMPEG_AVAILABLE)
8383
if(WIN32)
84-
list(APPEND VULKAN_VIDEO_DEC_LIBRARIES PRIVATE ${VULKAN_VIDEO_PARSER_LIB} ${AVCODEC_LIB} ${AVFORMAT_LIB} ${AVUTIL_LIB})
84+
list(APPEND VULKAN_VIDEO_DEC_LIBRARIES PRIVATE ${AVCODEC_LIB} ${AVFORMAT_LIB} ${AVUTIL_LIB})
8585
else()
8686
list(APPEND VULKAN_VIDEO_DEC_LIBRARIES PRIVATE -lavcodec -lavutil -lavformat)
87-
list(APPEND VULKAN_VIDEO_DEC_LIBRARIES PRIVATE -L${CMAKE_INSTALL_LIBDIR} -l${VULKAN_VIDEO_PARSER_LIB})
88-
list(APPEND VULKAN_VIDEO_DEC_LIBRARIES PRIVATE -L${LIBNVPARSER_BINARY_ROOT} -l${VULKAN_VIDEO_PARSER_LIB})
8987
endif()
9088
endif()
9189
######## END of TODO make FFMPEG linbraries and demuxer optional. ###################

0 commit comments

Comments
 (0)