[SCM] libav/master: Drop patches applied upstream
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun May 4 21:36:37 UTC 2014
The following commit has been merged in the master branch:
commit cd09d234a8d7c126e789de7ad8cb50c013a042fe
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sun May 4 16:10:15 2014 -0400
Drop patches applied upstream
diff --git a/debian/patches/01-Tweak-doxygen-config.patch b/debian/patches/01-Tweak-doxygen-config.patch
deleted file mode 100644
index 050f0f0..0000000
--- a/debian/patches/01-Tweak-doxygen-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Reinhard Tartler <siretart at tauware.de>
-Date: Mon, 28 Jun 2010 22:43:55 +0200
-Subject: [PATCH] Tweak doxygen config
-
-exclude some directories we use for packaging from doxygen documentation
----
- Doxyfile | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/doc/Doxyfile
-+++ b/doc/Doxyfile
-@@ -616,7 +616,7 @@ RECURSIVE = YES
- # excluded from the INPUT source files. This way you can easily exclude a
- # subdirectory from a directory tree whose root is specified with the INPUT tag.
-
--EXCLUDE =
-+EXCLUDE = debian debian-shared debian-static debian-cmov .pc .git
-
- # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
- # directories that are symbolic links (a Unix filesystem feature) are excluded
diff --git a/debian/patches/series b/debian/patches/series
index 558a130..3199e41 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
03-disable-configuration-warnings.patch
-spelling-errors.patch
-support-opus-in-ogg.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index 85aa7da..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-Description: Fix some spelling errors detected by lintian.
-
---- a/doc/filters.texi
-+++ b/doc/filters.texi
-@@ -52,7 +52,7 @@ terminated when the next special charact
-
- The name and arguments of the filter are optionally preceded and
- followed by a list of link labels.
--A link label allows to name a link and associate it to a filter output
-+A link label allows one to name a link and associate it to a filter output
- or input pad. The preceding labels @var{in_link_1}
- ... @var{in_link_N}, are associated to the filter input pads,
- the following labels @var{out_link_1} ... @var{out_link_M}, are
-@@ -2294,7 +2294,7 @@ value is "-1".
-
- @end table
-
--This filter allows to overlay a second video on top of main input of
-+This filter allows one to overlay a second video on top of main input of
- a filtergraph as shown in this graph:
- @example
- input -----------> deltapts0 --> overlay --> output
---- a/doc/indevs.texi
-+++ b/doc/indevs.texi
-@@ -291,7 +291,7 @@ other filename will be interpreted as de
-
- X11 video input device.
-
--This device allows to capture a region of an X11 display.
-+This device allows one to capture a region of an X11 display.
-
- The filename passed as input has the syntax:
- @example
---- a/doc/protocols.texi
-+++ b/doc/protocols.texi
-@@ -536,7 +536,7 @@ avplay sap://[ff0e::2:7ffe]
-
- @section tcp
-
--Trasmission Control Protocol.
-+Transmission Control Protocol.
-
- The required syntax for a TCP url is:
- @example
diff --git a/debian/patches/support-opus-in-ogg.patch b/debian/patches/support-opus-in-ogg.patch
deleted file mode 100644
index e4ef571..0000000
--- a/debian/patches/support-opus-in-ogg.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-From ecab1c77410f023b437c6ed3a3281be8f039e574 Mon Sep 17 00:00:00 2001
-From: Nicolas George <nicolas.george at normalesup.org>
-Date: Sun, 24 Jun 2012 11:38:18 +0200
-Subject: [PATCH] oggdec: add support for Opus in Ogg demuxing
-Applied-Upstream: yes
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720563
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=733884
-
-
----
- Changelog | 1 +
- libavformat/Makefile | 1 +
- libavformat/oggdec.c | 1 +
- libavformat/oggdec.h | 1 +
- libavformat/oggparseopus.c | 142 ++++++++++++++++++++++++++++++++++++++++++++
- libavformat/version.h | 4 +-
- 6 files changed, 148 insertions(+), 2 deletions(-)
- create mode 100644 libavformat/oggparseopus.c
-
---- a/libavformat/Makefile
-+++ b/libavformat/Makefile
-@@ -203,6 +203,7 @@ OBJS-$(CONFIG_OGG_DEMUXER)
- oggparsedirac.o \
- oggparseflac.o \
- oggparseogm.o \
-+ oggparseopus.o \
- oggparseskeleton.o \
- oggparsespeex.o \
- oggparsetheora.o \
---- a/libavformat/oggdec.c
-+++ b/libavformat/oggdec.c
-@@ -46,6 +46,7 @@ static const struct ogg_codec * const og
- &ff_theora_codec,
- &ff_flac_codec,
- &ff_celt_codec,
-+ &ff_opus_codec,
- &ff_old_dirac_codec,
- &ff_old_flac_codec,
- &ff_ogm_video_codec,
---- a/libavformat/oggdec.h
-+++ b/libavformat/oggdec.h
-@@ -116,6 +116,7 @@ extern const struct ogg_codec ff_ogm_tex
- extern const struct ogg_codec ff_ogm_video_codec;
- extern const struct ogg_codec ff_old_dirac_codec;
- extern const struct ogg_codec ff_old_flac_codec;
-+extern const struct ogg_codec ff_opus_codec;
- extern const struct ogg_codec ff_skeleton_codec;
- extern const struct ogg_codec ff_speex_codec;
- extern const struct ogg_codec ff_theora_codec;
---- /dev/null
-+++ b/libavformat/oggparseopus.c
-@@ -0,0 +1,142 @@
-+/*
-+ * Opus parser for Ogg
-+ * Copyright (c) 2012 Nicolas George
-+ *
-+ * 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
-+ */
-+
-+#include <string.h>
-+
-+#include "libavutil/intreadwrite.h"
-+#include "avformat.h"
-+#include "internal.h"
-+#include "oggdec.h"
-+
-+struct oggopus_private {
-+ int need_comments;
-+ unsigned pre_skip;
-+ int64_t cur_dts;
-+};
-+
-+#define OPUS_HEAD_SIZE 19
-+
-+static int opus_header(AVFormatContext *avf, int idx)
-+{
-+ struct ogg *ogg = avf->priv_data;
-+ struct ogg_stream *os = &ogg->streams[idx];
-+ AVStream *st = avf->streams[idx];
-+ struct oggopus_private *priv = os->private;
-+ uint8_t *packet = os->buf + os->pstart;
-+ uint8_t *extradata;
-+
-+ if (!priv) {
-+ priv = os->private = av_mallocz(sizeof(*priv));
-+ if (!priv)
-+ return AVERROR(ENOMEM);
-+ }
-+ if (os->flags & OGG_FLAG_BOS) {
-+ if (os->psize < OPUS_HEAD_SIZE || (AV_RL8(packet + 8) & 0xF0) != 0)
-+ return AVERROR_INVALIDDATA;
-+
-+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-+ st->codec->codec_id = AV_CODEC_ID_OPUS;
-+ st->codec->channels = AV_RL8(packet + 9);
-+ priv->pre_skip = AV_RL16(packet + 10);
-+
-+ extradata = av_malloc(os->psize + FF_INPUT_BUFFER_PADDING_SIZE);
-+ if (!extradata)
-+ return AVERROR(ENOMEM);
-+
-+ memcpy(extradata, packet, os->psize);
-+ st->codec->extradata = extradata;
-+ st->codec->extradata_size = os->psize;
-+
-+ st->codec->sample_rate = 48000;
-+ avpriv_set_pts_info(st, 64, 1, 48000);
-+ priv->need_comments = 1;
-+ return 1;
-+ }
-+
-+ if (priv->need_comments) {
-+ if (os->psize < 8 || memcmp(packet, "OpusTags", 8))
-+ return AVERROR_INVALIDDATA;
-+ ff_vorbis_comment(avf, &st->metadata, packet + 8, os->psize - 8);
-+ priv->need_comments--;
-+ return 1;
-+ }
-+
-+ return 0;
-+}
-+
-+static int opus_packet(AVFormatContext *avf, int idx)
-+{
-+ struct ogg *ogg = avf->priv_data;
-+ struct ogg_stream *os = &ogg->streams[idx];
-+ AVStream *st = avf->streams[idx];
-+ struct oggopus_private *priv = os->private;
-+ uint8_t *packet = os->buf + os->pstart;
-+ unsigned toc, toc_config, toc_count, frame_size, nb_frames = 1;
-+
-+ if (!os->psize)
-+ return AVERROR_INVALIDDATA;
-+
-+ toc = *packet;
-+ toc_config = toc >> 3;
-+ toc_count = toc & 3;
-+ frame_size = toc_config < 12 ? FFMAX(480, 960 * (toc_config & 3)) :
-+ toc_config < 16 ? 480 << (toc_config & 1) :
-+ 120 << (toc_config & 3);
-+ if (toc_count == 3) {
-+ if (os->psize < 2)
-+ return AVERROR_INVALIDDATA;
-+ nb_frames = packet[1] & 0x3F;
-+ } else if (toc_count) {
-+ nb_frames = 2;
-+ }
-+
-+ os->pduration = frame_size * nb_frames;
-+ if (os->lastpts != AV_NOPTS_VALUE) {
-+ if (st->start_time == AV_NOPTS_VALUE)
-+ st->start_time = os->lastpts;
-+ priv->cur_dts = os->lastdts = os->lastpts -= priv->pre_skip;
-+ }
-+
-+ priv->cur_dts += os->pduration;
-+ if ((os->flags & OGG_FLAG_EOS)) {
-+ int64_t skip = priv->cur_dts - os->granule + priv->pre_skip;
-+ skip = FFMIN(skip, os->pduration);
-+ if (skip > 0) {
-+ os->pduration = skip < os->pduration ? os->pduration - skip : 1;
-+ av_log(avf, AV_LOG_WARNING,
-+ "Last packet is truncated to %d (because of unimplemented end trim support).\n",
-+ os->pduration);
-+ return AVERROR_PATCHWELCOME;
-+ }
-+ }
-+
-+ return 0;
-+}
-+
-+const struct ogg_codec ff_opus_codec = {
-+ .name = "Opus",
-+ .magic = "OpusHead",
-+ .magicsize = 8,
-+ .header = opus_header,
-+ .packet = opus_packet,
-+ .granule_is_start = 1,
-+ .nb_header = 1,
-+};
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list