[gazebo] 01/01: Removed ffmpeg patch. Don't need it anymore

[Jose Luis Rivero]

This is an automated email from the git hooks/post-receive script.

jrivero-guest pushed a commit to branch master
in repository gazebo.

commit 9fe74340039874020fcf0d440ef281c231932733
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Sat Jul 16 09:40:55 2016 +0000

    Removed ffmpeg patch. Don't need it anymore
---
 debian/patches/ffmpeg_2.9.patch | 26 --------------------------
 debian/patches/series           |  1 -
 2 files changed, 27 deletions(-)

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
deleted file mode 100644
index 9bb9637..0000000
--- a/debian/patches/ffmpeg_2.9.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Replace deprecated FFmpeg API
-Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
-Author: Jose Luis Rivero <jrivero at osrfoundation.org>
-Last-Update: <2016-07-15>
-
-diff --git a/gazebo/common/Video.cc b/gazebo/common/Video.cc
-index 1a12e92..b53b9b0 100644
---- a/gazebo/common/Video.cc
-+++ b/gazebo/common/Video.cc
-@@ -67,7 +67,7 @@ void Video::Cleanup()
- {
- #ifdef HAVE_FFMPEG
-   // Free the YUV frame
--  av_free(this->avFrame);
-+  av_frame_free(this->avFrame);
- 
-   // Close the video file
-   avformat_close_input(&this->formatCtx);
-@@ -75,7 +75,7 @@ void Video::Cleanup()
-   // Close the codec
-   avcodec_close(this->codecCtx);
- 
--  av_free(avFrameDst);
-+  av_frame_free(avFrameDst);
- #endif
- }
diff --git a/debian/patches/series b/debian/patches/series
index 43cdec3..a9ad18e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0002_use_system_gtest.patch
 0005-fix-problems-on-manpage.patch
 0008-arial-font-removed-in-dfsg.patch
-ffmpeg_2.9.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gazebo.git