From 675809310258aa3abb617bce907ab4a0f6e50bac Mon Sep 17 00:00:00 2001 From: Evan Flynn Date: Sat, 16 Mar 2024 07:53:54 -0700 Subject: [PATCH] Test: try and fix permissive compilation failures Signed-off-by: Evan Flynn --- .github/workflows/build_test.yml | 4 ++-- include/usb_cam/formats/mjpeg.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index ae44d338..bd5ecb70 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -80,7 +80,7 @@ jobs: with: path: ros_ws/src - name: Build and Test ROS 1 - uses: ros-tooling/action-ros-ci@master + uses: ros-tooling/action-ros-ci@0.3.6 if: ${{ contains('["melodic", "noetic"]', matrix.ros_distro) }} continue-on-error: true with: @@ -89,7 +89,7 @@ jobs: vcs-repo-file-url: "" - name: Build and Test ROS 2 id: build_and_test_step - uses: ros-tooling/action-ros-ci@master + uses: ros-tooling/action-ros-ci@0.3.6 if: ${{ contains('["melodic", "noetic"]', matrix.ros_distro) == false }} with: package-name: usb_cam diff --git a/include/usb_cam/formats/mjpeg.hpp b/include/usb_cam/formats/mjpeg.hpp index 2faff235..2b40bb2b 100644 --- a/include/usb_cam/formats/mjpeg.hpp +++ b/include/usb_cam/formats/mjpeg.hpp @@ -233,7 +233,7 @@ class MJPEG2RGB : public pixel_format_base std::cerr << m_averror_str << std::endl; } - AVCodec * m_avcodec; + const AVCodec * m_avcodec; AVCodecContext * m_avcodec_context; AVCodecParserContext * m_avparser; AVFrame * m_avframe_device;