Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix rolling build issues #323

Closed
wants to merge 1 commit into from
Closed

Fix rolling build issues #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build_test.yml
View file
Open in desktop
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
View file
Open in desktop
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
Loading