[SCM] gmerlin-encoders/master.ubuntu: Take patch from upstream SVN trunk to fix FTBFS with libav.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master.ubuntu branch:
commit 723a79e78014f3874e55e3adc4dd29d27bbf7ea8
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Jul 30 11:21:41 2011 +0200

    Take patch from upstream SVN trunk to fix FTBFS with libav.

diff --git a/debian/patches/ffmpeg_to_libav.patch b/debian/patches/ffmpeg_to_libav.patch
new file mode 100644
index 0000000..0785684
--- /dev/null
+++ b/debian/patches/ffmpeg_to_libav.patch
@@ -0,0 +1,169 @@
+Description: FFmpeg -> libav, fixes FTBFS.
+Origin: upstream, commit:2783
+---
+ plugins/ffmpeg/codecs.c        |    2 
+ plugins/ffmpeg/ffmpeg_common.c |  128 ++++++++++++++++++++++++++++++++---------
+ 2 files changed, 100 insertions(+), 30 deletions(-)
+
+--- gmerlin-encoders.orig/plugins/ffmpeg/codecs.c
++++ gmerlin-encoders/plugins/ffmpeg/codecs.c
+@@ -819,8 +819,6 @@ bg_ffmpeg_set_codec_parameter(AVCodecCon
+   PARAM_FLOAT("ff_p_masking",p_masking);
+   PARAM_FLOAT("ff_dark_masking",dark_masking);
+   PARAM_ENUM("ff_prediction_method",prediction_method,prediction_method);
+-  PARAM_INT("ff_mb_qmin",mb_qmin);
+-  PARAM_INT("ff_mb_qmax",mb_qmax);
+   PARAM_ENUM("ff_me_cmp",me_cmp,compare_func);
+   PARAM_CMP_CHROMA("ff_me_cmp_chroma",me_cmp);
+   PARAM_ENUM("ff_me_sub_cmp",me_sub_cmp,compare_func);
+--- gmerlin-encoders.orig/plugins/ffmpeg/ffmpeg_common.c
++++ gmerlin-encoders/plugins/ffmpeg/ffmpeg_common.c
+@@ -31,6 +31,37 @@
+ 
+ #define LOG_DOMAIN "ffmpeg"
+ 
++#if LIBAVCODEC_VERSION_MAJOR >= 53
++#define CodecType AVMediaType
++#define CODEC_TYPE_UNKNOWN    AVMEDIA_TYPE_UNKNOWN
++#define CODEC_TYPE_VIDEO      AVMEDIA_TYPE_VIDEO
++#define CODEC_TYPE_AUDIO      AVMEDIA_TYPE_AUDIO
++#define CODEC_TYPE_DATA       AVMEDIA_TYPE_DATA
++#define CODEC_TYPE_SUBTITLE   AVMEDIA_TYPE_SUBTITLE
++#define CODEC_TYPE_ATTACHMENT AVMEDIA_TYPE_ATTACHMENT
++#define CODEC_TYPE_NB         AVMEDIA_TYPE_NB
++#endif
++
++
++#if LIBAVCODEC_VERSION_MAJOR >= 53
++#define PKT_FLAG_KEY AV_PKT_FLAG_KEY
++#endif
++
++#if LIBAVCODEC_VERSION_MAJOR >= 53
++#define guess_format(a, b, c) av_guess_format(a, b, c)
++#endif
++
++#if LIBAVFORMAT_VERSION_MAJOR >= 53
++#define NEW_METADATA
++#endif
++
++#ifdef NEW_METADATA
++#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,5,0)
++/* metadata -> dictionary */
++#define av_metadata_set2(a,b,c,d) av_dict_set(a,b,c,d)
++#endif
++#endif
++
+ static bg_parameter_info_t *
+ create_format_parameters(const ffmpeg_format_info_t * formats)
+   {
+@@ -158,6 +189,74 @@ void bg_ffmpeg_set_parameter(void * data
+   
+   }
+ 
++#ifdef NEW_METADATA
++static void set_metadata(ffmpeg_priv_t * priv,
++                         const bg_metadata_t * m)
++  {
++  if(m->title)
++    av_metadata_set2(&priv->ctx->metadata, "title", m->title, 0);
++
++  if(m->author)
++    av_metadata_set2(&priv->ctx->metadata, "composer", m->author, 0);
++
++  if(m->album)
++    av_metadata_set2(&priv->ctx->metadata, "album", m->album, 0);
++
++  if(m->copyright)
++    av_metadata_set2(&priv->ctx->metadata, "copyright", m->copyright, 0);
++
++  if(m->comment)
++    av_metadata_set2(&priv->ctx->metadata, "comment", m->comment, 0);
++
++  if(m->genre)
++    av_metadata_set2(&priv->ctx->metadata, "genre", m->genre, 0);
++
++  if(m->date)
++    av_metadata_set2(&priv->ctx->metadata, "date", m->date, 0);
++
++  if(m->track)
++    {
++    char * str = bg_sprintf("%d", m->track);
++    av_metadata_set2(&priv->ctx->metadata, "track", str, 0);
++    free(str);
++    }
++  }
++#else
++static void set_metadata(ffmpeg_priv_t * priv,
++                         const bg_metadata_t * metadata)
++  {
++  if(metadata->title)
++    strncpy(priv->ctx->title, metadata->title,
++            sizeof(priv->ctx->title)-1);
++
++  if(metadata->author)
++    strncpy(priv->ctx->author, metadata->author,
++            sizeof(priv->ctx->author)-1);
++
++  if(metadata->album)
++    strncpy(priv->ctx->album, metadata->album,
++            sizeof(priv->ctx->album)-1);
++
++  if(metadata->copyright)
++    strncpy(priv->ctx->copyright, metadata->copyright,
++            sizeof(priv->ctx->copyright)-1);
++
++  if(metadata->comment)
++    strncpy(priv->ctx->comment, metadata->comment,
++            sizeof(priv->ctx->comment)-1);
++
++  if(metadata->genre)
++    strncpy(priv->ctx->genre, metadata->genre,
++            sizeof(priv->ctx->genre)-1);
++
++  if(metadata->date)
++    priv->ctx->year = bg_metadata_get_year(metadata);
++
++  priv->ctx->track = metadata->track;
++
++  }
++#endif
++
+ int bg_ffmpeg_open(void * data, const char * filename,
+                    const bg_metadata_t * metadata,
+                    const bg_chapter_list_t * chapter_list)
+@@ -200,34 +299,7 @@ int bg_ffmpeg_open(void * data, const ch
+ 
+   if(metadata)
+     {
+-    if(metadata->title)
+-      strncpy(priv->ctx->title, metadata->title,
+-              sizeof(priv->ctx->title)-1);
+-
+-    if(metadata->author)
+-      strncpy(priv->ctx->author, metadata->author,
+-              sizeof(priv->ctx->author)-1);
+-
+-    if(metadata->album)
+-      strncpy(priv->ctx->album, metadata->album,
+-              sizeof(priv->ctx->album)-1);
+-
+-    if(metadata->copyright)
+-      strncpy(priv->ctx->copyright, metadata->copyright,
+-              sizeof(priv->ctx->copyright)-1);
+-
+-    if(metadata->comment)
+-      strncpy(priv->ctx->comment, metadata->comment,
+-              sizeof(priv->ctx->comment)-1);
+-    
+-    if(metadata->genre)
+-      strncpy(priv->ctx->genre, metadata->genre,
+-              sizeof(priv->ctx->genre)-1);
+-
+-    if(metadata->date)
+-      priv->ctx->year = bg_metadata_get_year(metadata);
+-    
+-    priv->ctx->track = metadata->track;
++    set_metadata(priv, metadata);
+     }
+   
+   return 1;
diff --git a/debian/patches/series b/debian/patches/series
index 48dc2d5..25ce577 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_typos.patch
+ffmpeg_to_libav.patch

-- 
gmerlin-encoders packaging