Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.16)
project("Pangolin")
set(PANGOLIN_VERSION_MAJOR 0)
set(PANGOLIN_VERSION_MINOR 9)
set(PANGOLIN_VERSION_PATCH 3)
set(PANGOLIN_VERSION_PATCH 4)
set(PANGOLIN_VERSION ${PANGOLIN_VERSION_MAJOR}.${PANGOLIN_VERSION_MINOR}.${PANGOLIN_VERSION_PATCH})

if(NOT CMAKE_CXX_STANDARD)
Expand Down
12 changes: 12 additions & 0 deletions components/pango_video/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,18 @@ create_factory_registry_file( "${CMAKE_CURRENT_BINARY_DIR}/include/pangolin/fact
target_sources(${COMPONENT} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/include/pangolin/factory/RegisterFactoriesVideoInterface.h")
target_sources(${COMPONENT} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/include/pangolin/factory/RegisterFactoriesVideoOutputInterface.h")

if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
# ignore errors in librealsense2 headers
target_compile_options(${COMPONENT} PUBLIC
-Wno-error=ignored-qualifiers
-Wno-error=sign-compare
-Wno-error=deprecated-copy
-Wno-error=missing-field-initializers
-Wno-error=missing-field-initializers
-Wno-error=pessimizing-move
)
endif()


if(BUILD_TESTS)
add_executable(test_video_uris ${CMAKE_CURRENT_LIST_DIR}/tests/tests_video_uri.cpp)
Expand Down
2 changes: 1 addition & 1 deletion components/pango_video/src/drivers/ffmpeg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ FfmpegVideo::~FfmpegVideo()
av_free(pFrameOut);
av_free(pFrame);

avcodec_close(pCodecContext);
avcodec_free_context(&pCodecContext);
avformat_close_input(&pFormatCtx);
sws_freeContext(img_convert_ctx);
}
Expand Down
2 changes: 1 addition & 1 deletion components/pango_video/src/drivers/ffmpeg_output.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ FfmpegVideoOutputStream::~FfmpegVideoOutputStream()
}

av_free(frame);
avcodec_close(codec_context);
avcodec_free_context(&codec_context);
}

FfmpegVideoOutput::FfmpegVideoOutput(const std::string& filename, int base_frame_rate, int bit_rate, bool flip_image)
Expand Down
4 changes: 2 additions & 2 deletions package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="3">
<name>pangolin</name>
<version>0.9.3</version>
<version>0.9.4</version>
<description>Pangolin is a set of lightweight and portable utility libraries for prototyping 3D, numeric or video based programs and algorithms.</description>
<maintainer email="stevenlovegrove@gmail.com">Steven Lovegrove</maintainer>
<maintainer email="Rauch.Christian@gmx.de">Christian Rauch</maintainer>
Expand All @@ -15,7 +15,7 @@
<depend>python3-dev</depend>
<build_depend>eigen</build_depend>
<depend>libpng-dev</depend>
<depend>libturbojpeg</depend>
<depend>libjpeg</depend>
<depend>libxkbcommon-dev</depend>
<depend>opengl</depend>
<build_depend>wayland-dev</build_depend>
Expand Down
Loading