[SCM] lives/master: Removed, no longer needed
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Sun Jan 17 17:01:46 UTC 2016
The following commit has been merged in the master branch:
commit c6ffcf3e9e0257dc6b823f6589b293405c49e770
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Sun Jan 17 17:25:52 2016 +0100
Removed, no longer needed
diff --git a/debian/patches/03-libav10.patch b/debian/patches/03-libav10.patch
deleted file mode 100644
index 011faeb..0000000
--- a/debian/patches/03-libav10.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-Description: Fix build with libav 10
- CODEC_ID_SNOW got removed and some other compat defines are missing. Also,
- av_close_input_file and av_codec_set_pkt_timebase do not exist.
-Author: Sebastian Ramacher <sramacher at debian.org>
-Last-Update: 2014-05-12
-
----
- libweed/weed-compat.h | 20 +++++++++++++++++---
- lives-plugins/plugins/decoders/avformat_decoder.c | 2 +-
- lives-plugins/plugins/decoders/libav_helper.h | 21 +++++++++++++++++++--
- lives-plugins/plugins/decoders/mkv_decoder.h | 1 -
- 4 files changed, 37 insertions(+), 7 deletions(-)
-
---- lives.orig/libweed/weed-compat.h
-+++ lives/libweed/weed-compat.h
-@@ -298,14 +298,14 @@ typedef struct AVCodecTag {
- #define CODEC_ID_FLASHSV2 AV_CODEC_ID_FLASHSV2
- #define CODEC_ID_TEXT AV_CODEC_ID_TEXT
- #define CODEC_ID_SSA AV_CODEC_ID_SSA
--#define CODEC_ID_SSA AV_CODEC_ID_SRT
-+#define CODEC_ID_SRT AV_CODEC_ID_SRT
- #define CODEC_ID_VP8 AV_CODEC_ID_VP8
- #define CODEC_ID_RV10 AV_CODEC_ID_RV10
- #define CODEC_ID_RV20 AV_CODEC_ID_RV20
- #define CODEC_ID_RV30 AV_CODEC_ID_RV30
- #define CODEC_ID_RV40 AV_CODEC_ID_RV40
- #define CODEC_ID_MP3 AV_CODEC_ID_MP3
--#define CODEC_ID_MP3 AV_CODEC_ID_MP2
-+#define CODEC_ID_MP2 AV_CODEC_ID_MP2
- #define CODEC_ID_AAC AV_CODEC_ID_AAC
- #define CODEC_ID_PCM_BLURAY AV_CODEC_ID_PCM_BLURAY
- #define CODEC_ID_AC3 AV_CODEC_ID_AC3
-@@ -343,7 +343,7 @@ typedef struct AVCodecTag {
-
- #define CODEC_ID_PCM_U8 AV_CODEC_ID_PCM_U8
-
--#define CODEC_ID_PCM_QDM2 AV_CODEC_ID_QDM2
-+#define CODEC_ID_QDM2 AV_CODEC_ID_QDM2
- #define CODEC_ID_RA_144 AV_CODEC_ID_RA_144
- #define CODEC_ID_RA_288 AV_CODEC_ID_RA_288
- #define CODEC_ID_ATRAC3 AV_CODEC_ID_ATRAC3
-@@ -354,6 +354,20 @@ typedef struct AVCodecTag {
-
- #define CODEC_ID_TTF AV_CODEC_ID_TTF
-
-+#define CODEC_ID_R10K AV_CODEC_ID_R10K
-+#define CODEC_ID_R210 AV_CODEC_ID_R210
-+#define CODEC_ID_V210 AV_CODEC_ID_V210
-+#define CODEC_ID_MJPEGB AV_CODEC_ID_MJPEGB
-+#define CODEC_ID_SVQ3 AV_CODEC_ID_SVQ3
-+#define CODEC_ID_8BPS AV_CODEC_ID_8BPS
-+#define CODEC_ID_SMC AV_CODEC_ID_SMC
-+#define CODEC_ID_QTRLE AV_CODEC_ID_QTRLE
-+#define CODEC_ID_QDRAW AV_CODEC_ID_QDRAW
-+#define CODEC_ID_DNXHD AV_CODEC_ID_DNXHD
-+#define CODEC_ID_SGI AV_CODEC_ID_SGI
-+#define CODEC_ID_DPX AV_CODEC_ID_DPX
-+#define CODEC_ID_PRORES AV_CODEC_ID_PRORES
-+
- #endif
-
- const AVCodecTag codec_bmp_tags[] = {
---- lives.orig/lives-plugins/plugins/decoders/libav_helper.h
-+++ lives/lives-plugins/plugins/decoders/libav_helper.h
-@@ -60,6 +60,7 @@
- #define CODEC_ID_VP3 AV_CODEC_ID_VP3
- #define CODEC_ID_VP5 AV_CODEC_ID_VP5
- #define CODEC_ID_VP6 AV_CODEC_ID_VP6
-+#define CODEC_ID_VP6A AV_CODEC_ID_VP6A
- #define CODEC_ID_VP6F AV_CODEC_ID_VP6F
- #define CODEC_ID_ASV1 AV_CODEC_ID_ASV1
- #define CODEC_ID_ASV2 AV_CODEC_ID_ASV2
-@@ -112,7 +113,7 @@
- #define CODEC_ID_FLASHSV2 AV_CODEC_ID_FLASHSV2
- #define CODEC_ID_TEXT AV_CODEC_ID_TEXT
- #define CODEC_ID_SSA AV_CODEC_ID_SSA
--#define CODEC_ID_SSA AV_CODEC_ID_SRT
-+#define CODEC_ID_SRT AV_CODEC_ID_SRT
- #define CODEC_ID_VP8 AV_CODEC_ID_VP8
- #define CODEC_ID_RV10 AV_CODEC_ID_RV10
- #define CODEC_ID_RV20 AV_CODEC_ID_RV20
-@@ -157,7 +158,7 @@
-
- #define CODEC_ID_PCM_U8 AV_CODEC_ID_PCM_U8
-
--#define CODEC_ID_PCM_QDM2 AV_CODEC_ID_QDM2
-+#define CODEC_ID_QDM2 AV_CODEC_ID_QDM2
- #define CODEC_ID_RA_144 AV_CODEC_ID_RA_144
- #define CODEC_ID_RA_288 AV_CODEC_ID_RA_288
- #define CODEC_ID_ATRAC3 AV_CODEC_ID_ATRAC3
-@@ -168,6 +169,20 @@
-
- #define CODEC_ID_TTF AV_CODEC_ID_TTF
-
-+#define CODEC_ID_R10K AV_CODEC_ID_R10K
-+#define CODEC_ID_R210 AV_CODEC_ID_R210
-+#define CODEC_ID_V210 AV_CODEC_ID_V210
-+#define CODEC_ID_MJPEGB AV_CODEC_ID_MJPEGB
-+#define CODEC_ID_SVQ3 AV_CODEC_ID_SVQ3
-+#define CODEC_ID_8BPS AV_CODEC_ID_8BPS
-+#define CODEC_ID_SMC AV_CODEC_ID_SMC
-+#define CODEC_ID_QTRLE AV_CODEC_ID_QTRLE
-+#define CODEC_ID_QDRAW AV_CODEC_ID_QDRAW
-+#define CODEC_ID_DNXHD AV_CODEC_ID_DNXHD
-+#define CODEC_ID_SGI AV_CODEC_ID_SGI
-+#define CODEC_ID_DPX AV_CODEC_ID_DPX
-+#define CODEC_ID_PRORES AV_CODEC_ID_PRORES
-+
- #endif
-
- #if ((LIBAVUTIL_VERSION_MAJOR < 51) || (LIBAVUTIL_VERSION_MAJOR == 51) && (LIBAVUTIL_VERSION_MINOR < 22))
-@@ -222,6 +237,8 @@ static void av_set_pts_info(AVStream *s,
- s->time_base = new_tb;
- #ifdef HAVE_AV_CODEC_SET_PKT_TIMEBASE
- av_codec_set_pkt_timebase(s->codec, new_tb);
-+#else
-+ s->codec->time_base = new_tb;
- #endif
- s->pts_wrap_bits = pts_wrap_bits;
- }
---- lives.orig/lives-plugins/plugins/decoders/mkv_decoder.h
-+++ lives/lives-plugins/plugins/decoders/mkv_decoder.h
-@@ -334,7 +334,6 @@ const CodecTags ff_mkv_codec_tags[]= {
- {"V_REAL/RV20" , CODEC_ID_RV20},
- {"V_REAL/RV30" , CODEC_ID_RV30},
- {"V_REAL/RV40" , CODEC_ID_RV40},
-- {"V_SNOW" , CODEC_ID_SNOW},
- {"V_THEORA" , CODEC_ID_THEORA},
- {"V_UNCOMPRESSED" , CODEC_ID_RAWVIDEO},
- {"V_VP8" , CODEC_ID_VP8},
---- lives.orig/lives-plugins/plugins/decoders/avformat_decoder.c
-+++ lives/lives-plugins/plugins/decoders/avformat_decoder.c
-@@ -673,7 +673,7 @@ static void detach_stream(lives_clip_dat
- close(priv->fd);
-
- // will close and free the context
-- if (priv->ic !=NULL) av_close_input_file(priv->ic);
-+ if (priv->ic !=NULL) avformat_close_input(&priv->ic);
-
- if (cdata->palettes!=NULL) free(cdata->palettes);
- cdata->palettes=NULL;
diff --git a/debian/patches/series b/debian/patches/series
index 4046572..bbfc995 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
02-drop_py3_multiencoder.patch
-03-libav10.patch
parallel-build.patch
--
lives packaging
More information about the pkg-multimedia-commits
mailing list