Skip to content

Commit

Permalink
Test: try and fix permissive compilation failures
Browse files Browse the repository at this point in the history
Signed-off-by: Evan Flynn <[email protected]>
  • Loading branch information
flynneva committed Mar 16, 2024
1 parent e2b11ab commit 6758093
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/usb_cam/formats/mjpeg.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 6758093

Please sign in to comment.