diff --git a/samples/videoDecode/CMakeLists.txt b/samples/videoDecode/CMakeLists.txt
index ae9cc23c80..e777d67ea7 100644
--- a/samples/videoDecode/CMakeLists.txt
+++ b/samples/videoDecode/CMakeLists.txt
@@ -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})
diff --git a/samples/videoDecodeMem/CMakeLists.txt b/samples/videoDecodeMem/CMakeLists.txt
index e5f9d88a1c..32f48a1905 100644
--- a/samples/videoDecodeMem/CMakeLists.txt
+++ b/samples/videoDecodeMem/CMakeLists.txt
@@ -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})
diff --git a/samples/videoDecodeMultiFiles/CMakeLists.txt b/samples/videoDecodeMultiFiles/CMakeLists.txt
index 716f6c8280..8eba0e9fd3 100644
--- a/samples/videoDecodeMultiFiles/CMakeLists.txt
+++ b/samples/videoDecodeMultiFiles/CMakeLists.txt
@@ -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})
diff --git a/samples/videoDecodePerf/CMakeLists.txt b/samples/videoDecodePerf/CMakeLists.txt
index fa107154b5..f0f4bd8c9f 100644
--- a/samples/videoDecodePerf/CMakeLists.txt
+++ b/samples/videoDecodePerf/CMakeLists.txt
@@ -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})
diff --git a/samples/videoDecodeRGB/CMakeLists.txt b/samples/videoDecodeRGB/CMakeLists.txt
index f64f63966a..a25d053cf5 100644
--- a/samples/videoDecodeRGB/CMakeLists.txt
+++ b/samples/videoDecodeRGB/CMakeLists.txt
@@ -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})
diff --git a/utils/video_demuxer.h b/utils/video_demuxer.h
index 131fc360d9..c20afc23f7 100644
--- a/utils/video_demuxer.h
+++ b/utils/video_demuxer.h
@@ -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"