Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/glb_tex_name' into …
Browse files Browse the repository at this point in the history
…glb_tex_name
  • Loading branch information
iche033 committed May 8, 2024
2 parents 163222b + 24d8502 commit 4b07788
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 0 deletions.
11 changes: 11 additions & 0 deletions .github/workflows/package_xml.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: Validate package.xml

on:
pull_request:

jobs:
package-xml:
runs-on: ubuntu-latest
name: Validate package.xml
steps:
- uses: gazebo-tooling/action-gz-ci/validate_package_xml@jammy
6 changes: 6 additions & 0 deletions av/src/AudioDecoder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,13 @@ common::AudioDecoder::Implementation::~Implementation()
{
// Close the codec
if (this->codecCtx)
{
#if LIBAVFORMAT_VERSION_MAJOR < 59
avcodec_close(this->codecCtx);
#else
avcodec_free_context(&this->codecCtx);
#endif
}

// Close the audio file
if (this->formatCtx)
Expand Down
4 changes: 4 additions & 0 deletions av/src/Video.cc
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,11 @@ void Video::Cleanup()
avformat_close_input(&this->dataPtr->formatCtx);

// Close the codec
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
avcodec_free_context(&this->dataPtr->codecCtx);
#else
avcodec_close(this->dataPtr->codecCtx);
#endif

av_free(this->dataPtr->avFrameDst);
}
Expand Down
28 changes: 28 additions & 0 deletions package.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0"?>
<package format="2">
<name>gz-common5</name>
<version>5.6.0</version>
<description>Gazebo Common : AV, Graphics, Events, and much more.</description>
<maintainer email="natekoenig@gmail.com">Nate Koenig</maintainer>
<license>Apache License 2.0</license>
<url type="website">https://github.com/gazebosim/gz-common</url>

<buildtool_depend>cmake</buildtool_depend>
<buildtool_depend>pkg-config</buildtool_depend>

<build_depend>gz-cmake3</build_depend>

<depend>assimp-dev</depend>
<depend>ffmpeg-dev</depend>
<depend>gz-math7</depend>
<depend>gz-utils2</depend>
<depend>libfreeimage-dev</depend>
<depend>libgdal-dev</depend>
<depend>libgts</depend>
<depend>tinyxml2</depend>
<depend>uuid</depend>

<export>
<build_type>cmake</build_type>
</export>
</package>

0 comments on commit 4b07788

Please sign in to comment.