[SCM] transcode/master: Refresh patches, add DEP-3 compliant headers.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c744ac5741bfcb351c14b8e7d666df3c586e96df
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Feb 21 11:00:37 2012 +0100

    Refresh patches, add DEP-3 compliant headers.

diff --git a/debian/patches/01_filter_pv.c.diff b/debian/patches/01_filter_pv.c.diff
index a0cb1af..fbaea17 100644
--- a/debian/patches/01_filter_pv.c.diff
+++ b/debian/patches/01_filter_pv.c.diff
@@ -1,8 +1,13 @@
-Little hack to replace xterm calls by x-terminal-emulator.
+Description: Little hack to replace xterm calls by x-terminal-emulator.
+Origin: Ubuntu
+Forwarded: Francesco Romani <fromani at gmail.com>
+---
+ filter/preview/filter_pv.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 --- transcode.orig/filter/preview/filter_pv.c
 +++ transcode/filter/preview/filter_pv.c
-@@ -488,7 +488,7 @@
+@@ -488,7 +488,7 @@ void preview_filter(void)
  
      // build commandline
      tc_snprintf (buf, 1024,
@@ -11,7 +16,7 @@ Little hack to replace xterm calls by x-terminal-emulator.
  	   vob->mod_path, vob->mod_path, tmpfile, tmpfile, tmpfile);
      if ((f = popen (buf, "r")) == NULL) {
  	perror ("popen filter select");
-@@ -555,7 +555,7 @@
+@@ -555,7 +555,7 @@ void preview_filter(void)
      memset (buf, 0, 1024);
  
      tc_snprintf (buf, 1024,
diff --git a/debian/patches/02_toolame.diff b/debian/patches/02_toolame.diff
index e4e17e5..944beb5 100644
--- a/debian/patches/02_toolame.diff
+++ b/debian/patches/02_toolame.diff
@@ -1,4 +1,9 @@
-Make a new export module for twolame now that toolame is gone in Debian.
+Description: Make a new export module for twolame now that toolame is gone in Debian.
+Origin: Ubuntu
+Forwarded: Francesco Romani <fromani at gmail.com>
+---
+ export/export_toolame.c |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
 --- transcode.orig/export/export_toolame.c
 +++ transcode/export/export_toolame.c
@@ -20,7 +25,7 @@ Make a new export module for twolame now that toolame is gone in Debian.
  #include "export_def.h"
  
  static FILE* 			pFile 		= NULL;
-@@ -85,8 +85,8 @@
+@@ -85,8 +85,8 @@ MOD_open
      char chan;
      char *ptr;
  
@@ -31,7 +36,7 @@ Make a new export module for twolame now that toolame is gone in Debian.
  
      /* verbose? */
      verb = (verbose & TC_DEBUG) ? 2:0;
-@@ -123,10 +123,10 @@
+@@ -123,10 +123,10 @@ MOD_open
      ofreq_dec = ofreq-ofreq_int*1000;
      */
  
diff --git a/debian/patches/03_libav-api-fixes.diff b/debian/patches/03_libav-api-fixes.diff
index 3828cb9..c8675d6 100644
--- a/debian/patches/03_libav-api-fixes.diff
+++ b/debian/patches/03_libav-api-fixes.diff
@@ -1,11 +1,16 @@
 Author: Reinhard Tartler <siretart at debian.org>
 Description: Update to libav 0.7 API
 Last-Modified: 2012-02-12
+Forwarded: Francesco Romani <fromani at gmail.com>
+---
+ export/export_ffmpeg.c |    2 ++
+ filter/filter_pp.c     |    4 ++--
+ import/decode_lavc.c   |   13 +++++++++----
+ import/probe_ffmpeg.c  |    4 ++--
+ 4 files changed, 15 insertions(+), 8 deletions(-)
 
-diff --git a/export/export_ffmpeg.c b/export/export_ffmpeg.c
-index 847f633..2f4c94b 100644
---- a/export/export_ffmpeg.c
-+++ b/export/export_ffmpeg.c
+--- transcode.orig/export/export_ffmpeg.c
++++ transcode/export/export_ffmpeg.c
 @@ -643,8 +643,10 @@ MOD_init
  
      lavc_venc_context->bit_rate           = vob->divxbitrate * 1000;
@@ -17,10 +22,8 @@ index 847f633..2f4c94b 100644
      lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
      lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
      lavc_venc_context->max_qdiff          = lavc_param_vqdiff;
-diff --git a/filter/filter_pp.c b/filter/filter_pp.c
-index 8790fd0..5b0a857 100644
---- a/filter/filter_pp.c
-+++ b/filter/filter_pp.c
+--- transcode.orig/filter/filter_pp.c
++++ transcode/filter/filter_pp.c
 @@ -38,8 +38,8 @@
  
  /* FIXME: these use the filter ID as an index--the ID can grow
@@ -32,10 +35,8 @@ index 8790fd0..5b0a857 100644
  static int width[100], height[100];
  static int pre[100];
  
-diff --git a/import/decode_lavc.c b/import/decode_lavc.c
-index 2dea95d..48977e1 100644
---- a/import/decode_lavc.c
-+++ b/import/decode_lavc.c
+--- transcode.orig/import/decode_lavc.c
++++ transcode/import/decode_lavc.c
 @@ -128,7 +128,7 @@ void decode_lavc(decode_t *decode)
    char *mp4_ptr=NULL;
    int flush = 0;
@@ -70,11 +71,9 @@ index 2dea95d..48977e1 100644
  
  	  if (len < 0) {
  	      tc_log_error(__FILE__, "frame decoding failed");
-diff --git a/import/probe_ffmpeg.c b/import/probe_ffmpeg.c
-index 2b7486b..89e4a50 100644
---- a/import/probe_ffmpeg.c
-+++ b/import/probe_ffmpeg.c
-@@ -47,7 +47,7 @@ static void translate_info(const AVFormatContext *ctx, ProbeInfo *info)
+--- transcode.orig/import/probe_ffmpeg.c
++++ transcode/import/probe_ffmpeg.c
+@@ -47,7 +47,7 @@ static void translate_info(const AVForma
      for (i = 0; i < ctx->nb_streams; i++) {
          st = ctx->streams[i];
  
@@ -83,7 +82,7 @@ index 2b7486b..89e4a50 100644
              info->bitrate = st->codec->bit_rate / 1000;
              info->width = st->codec->width;
              info->height = st->codec->height;
-@@ -65,7 +65,7 @@ static void translate_info(const AVFormatContext *ctx, ProbeInfo *info)
+@@ -65,7 +65,7 @@ static void translate_info(const AVForma
      for (i = 0; i < ctx->nb_streams; i++) {
          st = ctx->streams[i];
  

-- 
transcode packaging