[SCM] handbrake/master: debian/patches/0002-Fix-include... Update with a cleaner solution.

rbrito-guest at users.alioth.debian.org rbrito-guest at users.alioth.debian.org
Tue May 15 12:05:32 UTC 2012


The following commit has been merged in the master branch:
commit 04ed26246c8c6cd19a4531f03d4b9daaa371a1d7
Author: Rogério Brito <rbrito at ime.usp.br>
Date:   Tue May 15 09:02:01 2012 -0300

    debian/patches/0002-Fix-include... Update with a cleaner solution.
    
    Git-Dch: Short
    Thanks: Fabian Greffrath for the cleaner solution.

diff --git a/debian/patches/0002-Fix-include-with-the-system-s-libav.patch b/debian/patches/0002-Fix-include-with-the-system-s-libav.patch
index 4cd2ba3..4c2e471 100644
--- a/debian/patches/0002-Fix-include-with-the-system-s-libav.patch
+++ b/debian/patches/0002-Fix-include-with-the-system-s-libav.patch
@@ -5,179 +5,45 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+Thanks to Fabian Greffrath for the more elegant solution than the "brute
+force" that I employed earlier.
+
 Forwarded: no
 Last-Update: 2012-05-15
 Reviewed-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
 Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
 ---
- libhb/audioconvert.h    |  119 +++++++++++++++++++++++++++++++++++++++++++++++
- libhb/decavcodec.c      |    2 +-
- libhb/encavcodecaudio.c |    2 +-
- libhb/module.defs       |    2 +-
- 4 files changed, 122 insertions(+), 3 deletions(-)
- create mode 100644 libhb/audioconvert.h
+ libhb/decavcodec.c      |    4 +++-
+ libhb/encavcodecaudio.c |    4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
 
-diff --git a/libhb/audioconvert.h b/libhb/audioconvert.h
-new file mode 100644
-index 0000000..f50eb3e
---- /dev/null
-+++ b/libhb/audioconvert.h
-@@ -0,0 +1,119 @@
-+/*
-+ * audio conversion
-+ * Copyright (c) 2006 Michael Niedermayer <michaelni at gmx.at>
-+ * Copyright (c) 2008 Peter Ross
-+ *
-+ * This file is part of Libav.
-+ *
-+ * Libav is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * Libav is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with Libav; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef AVCODEC_AUDIOCONVERT_H
-+#define AVCODEC_AUDIOCONVERT_H
-+
-+/**
-+ * @file
-+ * Audio format conversion routines
-+ */
-+
-+
-+#include "libavutil/cpu.h"
-+#include "avcodec.h"
-+#include "libavutil/audioconvert.h"
-+
-+#if FF_API_OLD_SAMPLE_FMT
-+/**
-+ * @deprecated Use av_get_sample_fmt_string() instead.
-+ */
-+attribute_deprecated
-+void avcodec_sample_fmt_string(char *buf, int buf_size, int sample_fmt);
-+
-+/**
-+ * @deprecated Use av_get_sample_fmt_name() instead.
-+ */
-+attribute_deprecated
-+const char *avcodec_get_sample_fmt_name(int sample_fmt);
-+
-+/**
-+ * @deprecated Use av_get_sample_fmt() instead.
-+ */
-+attribute_deprecated
-+enum AVSampleFormat avcodec_get_sample_fmt(const char* name);
-+#endif
-+
-+#if FF_API_OLD_AUDIOCONVERT
-+/**
-+ * @deprecated Use av_get_channel_layout() instead.
-+ */
-+attribute_deprecated
-+int64_t avcodec_get_channel_layout(const char *name);
-+
-+/**
-+ * @deprecated Use av_get_channel_layout_string() instead.
-+ */
-+attribute_deprecated
-+void avcodec_get_channel_layout_string(char *buf, int buf_size, int nb_channels, int64_t channel_layout);
-+
-+/**
-+ * @deprecated Use av_get_channel_layout_nb_channels() instead.
-+ */
-+attribute_deprecated
-+int avcodec_channel_layout_num_channels(int64_t channel_layout);
-+#endif
-+
-+/**
-+ * Guess the channel layout
-+ * @param nb_channels
-+ * @param codec_id Codec identifier, or CODEC_ID_NONE if unknown
-+ * @param fmt_name Format name, or NULL if unknown
-+ * @return Channel layout mask
-+ */
-+uint64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name);
-+
-+struct AVAudioConvert;
-+typedef struct AVAudioConvert AVAudioConvert;
-+
-+/**
-+ * Create an audio sample format converter context
-+ * @param out_fmt Output sample format
-+ * @param out_channels Number of output channels
-+ * @param in_fmt Input sample format
-+ * @param in_channels Number of input channels
-+ * @param[in] matrix Channel mixing matrix (of dimension in_channel*out_channels). Set to NULL to ignore.
-+ * @param flags See AV_CPU_FLAG_xx
-+ * @return NULL on error
-+ */
-+AVAudioConvert *av_audio_convert_alloc(enum AVSampleFormat out_fmt, int out_channels,
-+                                       enum AVSampleFormat in_fmt, int in_channels,
-+                                       const float *matrix, int flags);
-+
-+/**
-+ * Free audio sample format converter context
-+ */
-+void av_audio_convert_free(AVAudioConvert *ctx);
-+
-+/**
-+ * Convert between audio sample formats
-+ * @param[in] out array of output buffers for each channel. set to NULL to ignore processing of the given channel.
-+ * @param[in] out_stride distance between consecutive output samples (measured in bytes)
-+ * @param[in] in array of input buffers for each channel
-+ * @param[in] in_stride distance between consecutive input samples (measured in bytes)
-+ * @param len length of audio frame size (measured in samples)
-+ */
-+int av_audio_convert(AVAudioConvert *ctx,
-+                           void * const out[6], const int out_stride[6],
-+                     const void * const  in[6], const int  in_stride[6], int len);
-+
-+#endif /* AVCODEC_AUDIOCONVERT_H */
 diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
-index fd58c5c..5ada89a 100644
+index fd58c5c..6192d1e 100644
 --- a/libhb/decavcodec.c
 +++ b/libhb/decavcodec.c
-@@ -38,7 +38,7 @@
+@@ -38,7 +38,9 @@
  #include "hb.h"
  #include "hbffmpeg.h"
  #include "downmix.h"
 -#include "libavcodec/audioconvert.h"
-+#include "audioconvert.h"
++
++struct AVAudioConvert;
++typedef struct AVAudioConvert AVAudioConvert;
  
  static void compute_frame_duration( hb_work_private_t *pv );
  static void flushDelayQueue( hb_work_private_t *pv );
 diff --git a/libhb/encavcodecaudio.c b/libhb/encavcodecaudio.c
-index 3a23256..0d97e8f 100644
+index 3a23256..dad8fa1 100644
 --- a/libhb/encavcodecaudio.c
 +++ b/libhb/encavcodecaudio.c
-@@ -7,7 +7,7 @@
+@@ -7,7 +7,9 @@
  #include "hb.h"
  #include "hbffmpeg.h"
  #include "downmix.h"
 -#include "libavcodec/audioconvert.h"
-+#include "audioconvert.h"
++
++struct AVAudioConvert;
++typedef struct AVAudioConvert AVAudioConvert;
  
  struct hb_work_private_s
  {
-diff --git a/libhb/module.defs b/libhb/module.defs
-index 3fefae8..3a5d10d 100644
---- a/libhb/module.defs
-+++ b/libhb/module.defs
-@@ -38,7 +38,7 @@ ifeq (1,$(FEATURE.ff.mpeg2))
- LIBHB.GCC.D += USE_FF_MPEG2
- endif
- LIBHB.GCC.D += __LIBHB__ USE_PTHREAD
--LIBHB.GCC.I += $(LIBHB.build/) $(CONTRIB.build/)include
-+LIBHB.GCC.I += $(LIBHB.build/) $(CONTRIB.build/)include /usr/include/libavcodec
- 
- ifeq ($(BUILD.system),cygwin)
-     LIBHB.GCC.D += SYS_CYGWIN

-- 
handbrake packaging



More information about the pkg-multimedia-commits mailing list