[SCM] lives/master: Refresh 03-libav10.patch
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Thu Jun 4 06:15:29 UTC 2015
The following commit has been merged in the master branch:
commit db7873a60170363e8838a54bc90cd919dae8b100
Author: Alessio Treglia <alessio at debian.org>
Date: Thu Jun 4 07:13:44 2015 +0100
Refresh 03-libav10.patch
diff --git a/debian/patches/03-libav10.patch b/debian/patches/03-libav10.patch
index c2a922d..011faeb 100644
--- a/debian/patches/03-libav10.patch
+++ b/debian/patches/03-libav10.patch
@@ -5,24 +5,15 @@ Author: Sebastian Ramacher <sramacher at debian.org>
Last-Update: 2014-05-12
---
- libweed/weed-compat.h | 22 +++++++++++++++++-----
+ libweed/weed-compat.h | 20 +++++++++++++++++---
lives-plugins/plugins/decoders/avformat_decoder.c | 2 +-
- lives-plugins/plugins/decoders/libav_helper.h | 22 +++++++++++++++++++---
- lives-plugins/plugins/decoders/mkv_decoder.c | 1 -
+ lives-plugins/plugins/decoders/libav_helper.h | 21 +++++++++++++++++++--
lives-plugins/plugins/decoders/mkv_decoder.h | 1 -
- 5 files changed, 37 insertions(+), 11 deletions(-)
+ 4 files changed, 37 insertions(+), 7 deletions(-)
--- lives.orig/libweed/weed-compat.h
+++ lives/libweed/weed-compat.h
-@@ -260,7 +260,6 @@ typedef struct AVCodecTag {
- #define CODEC_ID_TRUEMOTION2 AV_CODEC_ID_TRUEMOTION2
- #define CODEC_ID_MSZH AV_CODEC_ID_MSZH
- #define CODEC_ID_ZLIB AV_CODEC_ID_ZLIB
--#define CODEC_ID_SNOW AV_CODEC_ID_SNOW
- #define CODEC_ID_4XM AV_CODEC_ID_4XM
- #define CODEC_ID_FLV1 AV_CODEC_ID_FLV1
- #define CODEC_ID_FLASHSV AV_CODEC_ID_FLASHSV
-@@ -294,14 +293,14 @@ typedef struct AVCodecTag {
+@@ -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
@@ -39,7 +30,7 @@ Last-Update: 2014-05-12
#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
-@@ -339,7 +338,7 @@ typedef struct AVCodecTag {
+@@ -343,7 +343,7 @@ typedef struct AVCodecTag {
#define CODEC_ID_PCM_U8 AV_CODEC_ID_PCM_U8
@@ -48,7 +39,7 @@ Last-Update: 2014-05-12
#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
-@@ -350,6 +349,20 @@ typedef struct AVCodecTag {
+@@ -354,6 +354,20 @@ typedef struct AVCodecTag {
#define CODEC_ID_TTF AV_CODEC_ID_TTF
@@ -69,14 +60,6 @@ Last-Update: 2014-05-12
#endif
const AVCodecTag codec_bmp_tags[] = {
-@@ -526,7 +539,6 @@ const AVCodecTag codec_bmp_tags[] = {
- { CODEC_ID_TRUEMOTION1, MKTAG('P', 'V', 'E', 'Z') },
- { CODEC_ID_MSZH, MKTAG('M', 'S', 'Z', 'H') },
- { CODEC_ID_ZLIB, MKTAG('Z', 'L', 'I', 'B') },
-- { CODEC_ID_SNOW, MKTAG('S', 'N', 'O', 'W') },
- { CODEC_ID_4XM, MKTAG('4', 'X', 'M', 'V') },
- { CODEC_ID_FLV1, MKTAG('F', 'L', 'V', '1') },
- { CODEC_ID_FLASHSV, MKTAG('F', 'S', 'V', '1') },
--- lives.orig/lives-plugins/plugins/decoders/libav_helper.h
+++ lives/lives-plugins/plugins/decoders/libav_helper.h
@@ -60,6 +60,7 @@
@@ -87,15 +70,7 @@ Last-Update: 2014-05-12
#define CODEC_ID_VP6F AV_CODEC_ID_VP6F
#define CODEC_ID_ASV1 AV_CODEC_ID_ASV1
#define CODEC_ID_ASV2 AV_CODEC_ID_ASV2
-@@ -74,7 +75,6 @@
- #define CODEC_ID_TRUEMOTION2 AV_CODEC_ID_TRUEMOTION2
- #define CODEC_ID_MSZH AV_CODEC_ID_MSZH
- #define CODEC_ID_ZLIB AV_CODEC_ID_ZLIB
--#define CODEC_ID_SNOW AV_CODEC_ID_SNOW
- #define CODEC_ID_4XM AV_CODEC_ID_4XM
- #define CODEC_ID_FLV1 AV_CODEC_ID_FLV1
- #define CODEC_ID_FLASHSV AV_CODEC_ID_FLASHSV
-@@ -108,7 +108,7 @@
+@@ -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
@@ -104,7 +79,7 @@ Last-Update: 2014-05-12
#define CODEC_ID_VP8 AV_CODEC_ID_VP8
#define CODEC_ID_RV10 AV_CODEC_ID_RV10
#define CODEC_ID_RV20 AV_CODEC_ID_RV20
-@@ -153,7 +153,7 @@
+@@ -157,7 +158,7 @@
#define CODEC_ID_PCM_U8 AV_CODEC_ID_PCM_U8
@@ -113,7 +88,7 @@ Last-Update: 2014-05-12
#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
-@@ -164,6 +164,20 @@
+@@ -168,6 +169,20 @@
#define CODEC_ID_TTF AV_CODEC_ID_TTF
@@ -134,38 +109,28 @@ Last-Update: 2014-05-12
#endif
#if ((LIBAVUTIL_VERSION_MAJOR < 51) || (LIBAVUTIL_VERSION_MAJOR == 51) && (LIBAVUTIL_VERSION_MINOR < 22))
-@@ -219,6 +233,8 @@ static void av_set_pts_info(AVStream *s,
- s->time_base = new_tb;
+@@ -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);
+ av_codec_set_pkt_timebase(s->codec, new_tb);
+#else
-+ s->codec->time_base = new_tb;
++ s->codec->time_base = new_tb;
#endif
- s->pts_wrap_bits = pts_wrap_bits;
+ s->pts_wrap_bits = pts_wrap_bits;
}
---- lives.orig/lives-plugins/plugins/decoders/mkv_decoder.c
-+++ lives/lives-plugins/plugins/decoders/mkv_decoder.c
-@@ -1610,7 +1610,6 @@ static int lives_mkv_read_header(lives_c
- switch (priv->vidst->codec->codec_id) {
- case CODEC_ID_VP8 : sprintf(cdata->video_name,"%s","vp8"); break;
- case CODEC_ID_THEORA : sprintf(cdata->video_name,"%s","theora"); break;
-- case CODEC_ID_SNOW : sprintf(cdata->video_name,"%s","snow"); break;
- case CODEC_ID_DIRAC : sprintf(cdata->video_name,"%s","dirac"); break;
- case CODEC_ID_MJPEG : sprintf(cdata->video_name,"%s","mjpeg"); break;
- case CODEC_ID_MPEG1VIDEO : sprintf(cdata->video_name,"%s","mpeg1"); break;
--- 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},
+@@ -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_da
+@@ -673,7 +673,7 @@ static void detach_stream(lives_clip_dat
close(priv->fd);
// will close and free the context
--
lives packaging
More information about the pkg-multimedia-commits
mailing list