[gazebo] 01/05: Replace deprecated FFmpeg API. (Closes: #803816)

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository gazebo.

commit 6f51db43584875a4737ecbc41bbde572e13a043c
Author: Anton Gladky <gladk at debian.org>
Date:   Tue Nov 10 21:34:40 2015 +0100

    Replace deprecated FFmpeg API. (Closes: #803816)
---
 debian/patches/ffmpeg_2.9.patch | 33 +++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 2 files changed, 34 insertions(+)

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 0000000..20ff187
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,33 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
+Last-Update: <2015-11-02>
+
+--- gazebo-6.5.0+dfsg.orig/gazebo/common/Video.cc
++++ gazebo-6.5.0+dfsg/gazebo/common/Video.cc
+@@ -70,7 +70,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);
+@@ -147,7 +147,7 @@ bool Video::Load(const std::string &_fil
+     return false;
+   }
+ 
+-  avpicture_alloc(this->pic, PIX_FMT_RGB24, this->codecCtx->width,
++  avpicture_alloc(this->pic, AV_PIX_FMT_RGB24, this->codecCtx->width,
+                   this->codecCtx->height);
+ 
+   this->swsCtx = sws_getContext(
+@@ -156,7 +156,7 @@ bool Video::Load(const std::string &_fil
+       this->codecCtx->pix_fmt,
+       this->codecCtx->width,
+       this->codecCtx->height,
+-      PIX_FMT_RGB24,
++      AV_PIX_FMT_RGB24,
+       SWS_BICUBIC, NULL, NULL, NULL);
+ 
+   if (this->swsCtx == NULL)
diff --git a/debian/patches/series b/debian/patches/series
index 1ac001d..bfbf34d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 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