[SCM] transcode/master: Add missing include

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit dbde862a79c4eba193f293acb759797061edc3fa
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Mar 1 17:50:02 2014 +0100

    Add missing include

diff --git a/debian/patches/11_libav10.patch b/debian/patches/11_libav10.patch
index 94f9fa9..1cd8f53 100644
--- a/debian/patches/11_libav10.patch
+++ b/debian/patches/11_libav10.patch
@@ -3,10 +3,8 @@ Author: Anton Khirnov <anton at khirnov.net>
 Bug-Debian: https://bugs.debian.org/739428
 Last-Update: 2014-03-01
 
-Index: transcode-1.1.7/export/aud_aux.c
-===================================================================
---- transcode-1.1.7.orig/export/aud_aux.c	2014-02-28 21:36:36.000000000 +0000
-+++ transcode-1.1.7/export/aud_aux.c	2014-02-28 21:46:03.418899933 +0000
+--- a/export/aud_aux.c
++++ b/export/aud_aux.c
 @@ -326,10 +326,10 @@
  
      switch (o_codec) {
@@ -29,20 +27,19 @@ Index: transcode-1.1.7/export/aud_aux.c
          return(TC_EXPORT_ERROR);
      }
  
-Index: transcode-1.1.7/filter/filter_resample.c
-===================================================================
---- transcode-1.1.7.orig/filter/filter_resample.c	2011-11-19 16:50:27.000000000 +0000
-+++ transcode-1.1.7/filter/filter_resample.c	2014-03-01 15:17:43.612773553 +0000
-@@ -38,6 +38,8 @@
+--- a/filter/filter_resample.c
++++ b/filter/filter_resample.c
+@@ -38,6 +38,9 @@
  #include "libtc/tcavcodec.h"
  #include "libtc/tcmodule-plugin.h"
  
 +#include <libavresample/avresample.h>
++#include <libavutil/opt.h>
 +
  
  typedef struct {
      uint8_t *resample_buf;
-@@ -45,7 +47,7 @@
+@@ -45,7 +48,7 @@
  
      int bytes_per_sample;
  
@@ -51,7 +48,7 @@ Index: transcode-1.1.7/filter/filter_resample.c
  } ResamplePrivateData;
  
  static const char resample_help[] = ""
-@@ -65,6 +67,7 @@
+@@ -65,6 +68,7 @@
  {
      double samples_per_frame, ratio;
      ResamplePrivateData *pd = NULL;
@@ -59,7 +56,7 @@ Index: transcode-1.1.7/filter/filter_resample.c
  
      TC_MODULE_SELF_CHECK(self, "configure");
      TC_MODULE_SELF_CHECK(vob, "configure"); /* paranoia */
-@@ -110,12 +113,20 @@
+@@ -110,12 +114,20 @@
          goto abort;
      }
  
@@ -86,7 +83,7 @@ Index: transcode-1.1.7/filter/filter_resample.c
          goto abort;
      }
  
-@@ -148,10 +159,8 @@
+@@ -148,10 +160,8 @@
  
      pd = self->userdata;
  
@@ -99,7 +96,7 @@ Index: transcode-1.1.7/filter/filter_resample.c
      if (pd->resample_buf != NULL) {
          tc_free(pd->resample_buf);
          pd->resample_buf = NULL;
-@@ -186,10 +195,9 @@
+@@ -186,10 +196,9 @@
      if (verbose >= TC_STATS)
          tc_log_info(MOD_NAME, "inbuf: %i, bufsize: %lu",
                      frame->audio_size, (unsigned long)pd->resample_bufsize);
@@ -113,10 +110,8 @@ Index: transcode-1.1.7/filter/filter_resample.c
      frame->audio_size *= pd->bytes_per_sample;
      if (verbose >= TC_STATS)
          tc_log_info(MOD_NAME, "outbuf: %i", frame->audio_size);
-Index: transcode-1.1.7/import/decode_lavc.c
-===================================================================
---- transcode-1.1.7.orig/import/decode_lavc.c	2014-02-28 21:36:36.000000000 +0000
-+++ transcode-1.1.7/import/decode_lavc.c	2014-03-01 15:23:18.856025243 +0000
+--- a/import/decode_lavc.c
++++ b/import/decode_lavc.c
 @@ -58,37 +58,37 @@
  
  // fourCC to ID mapping taken from MPlayer's codecs.conf
@@ -171,10 +166,8 @@ Index: transcode-1.1.7/import/decode_lavc.c
      {"MPG2", ""}},
    {0, TC_CODEC_UNKNOWN, NULL, {""}}};
  
-Index: transcode-1.1.7/import/import_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/import/import_ffmpeg.c	2014-02-28 21:36:36.000000000 +0000
-+++ transcode-1.1.7/import/import_ffmpeg.c	2014-03-01 15:22:14.847450571 +0000
+--- a/import/import_ffmpeg.c
++++ b/import/import_ffmpeg.c
 @@ -59,51 +59,51 @@
  
  // fourCC to ID mapping taken from MPlayer's codecs.conf
@@ -306,10 +299,8 @@ Index: transcode-1.1.7/import/import_ffmpeg.c
  	bkey = 1;
        }
  
-Index: transcode-1.1.7/import/probe_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/import/probe_ffmpeg.c	2014-02-28 21:36:36.000000000 +0000
-+++ transcode-1.1.7/import/probe_ffmpeg.c	2014-03-01 15:24:25.244658062 +0000
+--- a/import/probe_ffmpeg.c
++++ b/import/probe_ffmpeg.c
 @@ -51,8 +51,8 @@
              info->bitrate = st->codec->bit_rate / 1000;
              info->width = st->codec->width;
diff --git a/debian/patches/11_underlinkage.patch b/debian/patches/12_underlinkage.patch
similarity index 100%
rename from debian/patches/11_underlinkage.patch
rename to debian/patches/12_underlinkage.patch

-- 
transcode packaging