[med-svn] r8145 - trunk/packages/vxl/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-10-13 16:54:11 +0000 (Thu, 13 Oct 2011)
New Revision: 8145

Modified:
   trunk/packages/vxl/trunk/debian/patches/fix_libav07.patch
Log:
cleanup patch

Modified: trunk/packages/vxl/trunk/debian/patches/fix_libav07.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/fix_libav07.patch	2011-10-13 16:23:18 UTC (rev 8144)
+++ trunk/packages/vxl/trunk/debian/patches/fix_libav07.patch	2011-10-13 16:54:11 UTC (rev 8145)
@@ -4,8 +4,8 @@
 
 Index: vxl-1.14.0/core/vidl/vidl_ffmpeg_istream_v2.txx
 ===================================================================
---- vxl-1.14.0.orig/core/vidl/vidl_ffmpeg_istream_v2.txx	2011-09-24 20:55:45.000000000 +0200
-+++ vxl-1.14.0/core/vidl/vidl_ffmpeg_istream_v2.txx	2011-09-24 20:57:35.000000000 +0200
+--- vxl-1.14.0.orig/core/vidl/vidl_ffmpeg_istream_v2.txx	2009-07-07 23:13:03.000000000 +0200
++++ vxl-1.14.0/core/vidl/vidl_ffmpeg_istream_v2.txx	2011-10-13 18:02:59.000000000 +0200
 @@ -145,7 +145,7 @@
    is_->vid_index_ = -1;
    for ( unsigned i = 0; i < is_->fmt_cxt_->nb_streams; ++i ) {
@@ -56,10 +56,26 @@
      }
 Index: vxl-1.14.0/core/vidl/vidl_ffmpeg_ostream_v3.txx
 ===================================================================
---- vxl-1.14.0.orig/core/vidl/vidl_ffmpeg_ostream_v3.txx	2011-09-24 20:55:45.000000000 +0200
-+++ vxl-1.14.0/core/vidl/vidl_ffmpeg_ostream_v3.txx	2011-09-24 20:57:35.000000000 +0200
-@@ -100,7 +100,7 @@
+--- vxl-1.14.0.orig/core/vidl/vidl_ffmpeg_ostream_v3.txx	2009-05-17 21:02:39.000000000 +0200
++++ vxl-1.14.0/core/vidl/vidl_ffmpeg_ostream_v3.txx	2011-10-13 18:50:50.000000000 +0200
+@@ -31,6 +31,15 @@
  
+ //-----------------------------------------------------------------------------
+ 
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 30, 2)
++#define AV_PKT_FLAG_KEY PKT_FLAG_KEY
++#endif
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 64, 0)
++#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
++#endif
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 45, 0)
++#define av_guess_format(...) guess_format(__VA_ARGS__)
++#endif
+ 
+ struct vidl_ffmpeg_ostream::pimpl
+ {
+@@ -100,7 +109,7 @@
+ 
    AVOutputFormat* file_oformat = 0;
    if ( params_.file_format_ == vidl_ffmpeg_ostream_params::GUESS ) {
 -    file_oformat = guess_format(NULL, filename_.c_str(), NULL);
@@ -67,7 +83,7 @@
      if (!file_oformat) {
        vcl_cerr << "ffmpeg: Unable for find a suitable output format for "
                 << filename_ << '\n';
-@@ -132,7 +132,7 @@
+@@ -132,7 +141,7 @@
        vcl_strcmp(file_oformat->name, "3gp") != 0 )
      video_enc->flags |= CODEC_FLAG_GLOBAL_HEADER;
  
@@ -76,7 +92,7 @@
  
    switch ( params_.encoder_ )
    {
-@@ -318,8 +318,8 @@
+@@ -318,8 +327,8 @@
    video_enc->qmax = params_.video_qmax_;
    video_enc->lmin = params_.video_lmin_;
    video_enc->lmax = params_.video_lmax_;
@@ -87,22 +103,20 @@
    video_enc->max_qdiff = params_.video_qdiff_;
    video_enc->qblur = params_.video_qblur_;
    video_enc->qcompress = params_.video_qcomp_;
-@@ -377,10 +377,10 @@
+@@ -377,10 +386,12 @@
    }
  
    os_->fmt_cxt_->timestamp = 0;
--  os_->fmt_cxt_->title[0] = '\0';
--  os_->fmt_cxt_->author[0] = '\0';
--  os_->fmt_cxt_->copyright[0] = '\0';
--  os_->fmt_cxt_->comment[0] = '\0';
-+  //os_->fmt_cxt_->title[0] = '\0';
-+  //os_->fmt_cxt_->author[0] = '\0';
-+  //os_->fmt_cxt_->copyright[0] = '\0';
-+  //os_->fmt_cxt_->comment[0] = '\0';
++#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 31, 0)
+   os_->fmt_cxt_->title[0] = '\0';
+   os_->fmt_cxt_->author[0] = '\0';
+   os_->fmt_cxt_->copyright[0] = '\0';
+   os_->fmt_cxt_->comment[0] = '\0';
++#endif
  
    vcl_strncpy( os_->fmt_cxt_->filename, filename_.c_str(), 1023 );
  
-@@ -542,7 +542,7 @@
+@@ -542,7 +553,7 @@
        pkt.pts = codec->coded_frame->pts;
      }
      if ( codec->coded_frame && codec->coded_frame->key_frame ) {