[gazebo] 05/06: Update ffmpeg patch

[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 d97f5ff7a370f3082a55de2cbaf9ba5f07672eea
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Thu Jul 14 23:13:59 2016 +0000

    Update ffmpeg patch
---
 debian/patches/ffmpeg_2.9.patch | 37 +++++++++++++++----------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
index 20ff187..9bb9637 100644
--- a/debian/patches/ffmpeg_2.9.patch
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -1,33 +1,26 @@
 Description: Replace deprecated FFmpeg API
 Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
-Last-Update: <2015-11-02>
+Author: Jose Luis Rivero <jrivero at osrfoundation.org>
+Last-Update: <2016-07-15>
 
---- 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()
+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);
++  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;
-   }
+@@ -75,7 +75,7 @@ void Video::Cleanup()
+   // Close the codec
+   avcodec_close(this->codecCtx);
  
--  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)
+-  av_free(avFrameDst);
++  av_frame_free(avFrameDst);
+ #endif
+ }

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