diff --git a/Dockerfiles/sles-15.7.Dockerfile b/Dockerfiles/sles-15.7.Dockerfile index 31d4daac9..315d08340 100644 --- a/Dockerfiles/sles-15.7.Dockerfile +++ b/Dockerfiles/sles-15.7.Dockerfile @@ -17,6 +17,7 @@ RUN zypper -qni update -y && \ wget \ git \ curl \ + nasm \ python313 \ libdw-devel \ Mesa-libGL-devel \ @@ -65,6 +66,16 @@ ENV LD_LIBRARY_PATH="${VULKAN_SDK}/lib" ENV VK_ADD_LAYER_PATH="${VULKAN_SDK}/share/vulkan/explicit_layer.d" ENV PKG_CONFIG_PATH="${VULKAN_SDK}/share/pkgconfig:${VULKAN_SDK}/lib/pkgconfig" +# build ffmpeg from source +WORKDIR /tmp +RUN wget https://ffmpeg.org/releases/ffmpeg-4.4.6.tar.xz && \ + tar -xvf ffmpeg-4.4.6.tar.xz && \ + cd ffmpeg-4.4.6 && \ + ./configure --enable-pic --enable-shared && \ + make -j$(nproc) && \ + make install && \ + rm -rf /tmp/ffmpeg-4.4.6* + ENV HIP_PLATFORM=amd WORKDIR /workspace diff --git a/Dockerfiles/ubuntu-22.04.Dockerfile b/Dockerfiles/ubuntu-22.04.Dockerfile index a4542998e..20eb1036d 100644 --- a/Dockerfiles/ubuntu-22.04.Dockerfile +++ b/Dockerfiles/ubuntu-22.04.Dockerfile @@ -19,7 +19,10 @@ RUN apt-get update -qq && \ libvulkan-dev \ glslang-tools \ libtiff-dev \ - libopencv-dev && \ + libopencv-dev \ + libavcodec-dev \ + libavformat-dev \ + libavutil-dev && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* diff --git a/Libraries/rocDecode/rocdec_decode/main.cpp b/Libraries/rocDecode/rocdec_decode/main.cpp index 87453fe4d..ee51db324 100644 --- a/Libraries/rocDecode/rocdec_decode/main.cpp +++ b/Libraries/rocDecode/rocdec_decode/main.cpp @@ -751,10 +751,10 @@ int main(int argc, char** argv) { for (const auto& entry : fs::directory_iterator(input_file_path)) { - if (entry.is_directory()) + if (fs::is_directory(entry.path())) { std::vector file_names_sub_folder; - for (const auto& sub_entry : fs::directory_iterator(entry)) + for (const auto& sub_entry : fs::directory_iterator(entry.path())) { file_names_sub_folder.push_back(sub_entry.path()); } @@ -762,7 +762,7 @@ int main(int argc, char** argv) input_file_names.insert(input_file_names.end(), file_names_sub_folder.begin(), file_names_sub_folder.end()); file_names_sub_folder.clear(); } - else if(entry.is_regular_file()) + else if (fs::is_regular_file(entry.path())) { b_sort_filenames = true; input_file_names.push_back(entry.path());