[Pkg-voip-commits] r10475 - in /linphone/trunk/debian: changelog patches/libav10.patch
msp at alioth.debian.org
msp at alioth.debian.org
Wed May 14 12:41:15 UTC 2014
Author: msp
Date: Wed May 14 12:41:15 2014
New Revision: 10475
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10475
Log:
* Fix "FTBFS with libav10" upload to unstable (Closes: #739314)
* Refresh libav10.patch
Modified:
linphone/trunk/debian/changelog
linphone/trunk/debian/patches/libav10.patch
Modified: linphone/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/changelog?rev=10475&op=diff
==============================================================================
--- linphone/trunk/debian/changelog (original)
+++ linphone/trunk/debian/changelog Wed May 14 12:41:15 2014
@@ -11,6 +11,8 @@
* Fix "linphone Broken Vcs-Svn: header in debian/control"
updated debian/control (Closes: #743652)
* Add Build-Depends: polarssl, gsm1
+ * Fix "FTBFS with libav10" upload to unstable (Closes: #739314)
+ * Refresh libav10.patch
-- Mark Purcell <msp at debian.org> Fri, 18 Apr 2014 21:25:06 +1000
Modified: linphone/trunk/debian/patches/libav10.patch
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/patches/libav10.patch?rev=10475&op=diff
==============================================================================
--- linphone/trunk/debian/patches/libav10.patch (original)
+++ linphone/trunk/debian/patches/libav10.patch Wed May 14 12:41:15 2014
@@ -5,8 +5,8 @@
Index: linphone-3.7.0/mediastreamer2/src/videofilters/nowebcam.c
===================================================================
---- linphone-3.7.0.orig/mediastreamer2/src/videofilters/nowebcam.c 2014-02-06 01:00:16.000000000 +1100
-+++ linphone-3.7.0/mediastreamer2/src/videofilters/nowebcam.c 2014-04-19 16:53:06.270261472 +1000
+--- linphone-3.7.0.orig/mediastreamer2/src/videofilters/nowebcam.c 2014-02-06 01:00:16.866143371 +1100
++++ linphone-3.7.0/mediastreamer2/src/videofilters/nowebcam.c 2014-05-14 22:00:11.539464306 +1000
@@ -56,20 +56,25 @@
#ifndef NO_FFMPEG
AVCodecContext av_context;
@@ -76,8 +76,8 @@
Index: linphone-3.7.0/mediastreamer2/src/videofilters/videoenc.c
===================================================================
--- linphone-3.7.0.orig/mediastreamer2/src/videofilters/videoenc.c 2014-01-21 22:24:46.622558345 +1100
-+++ linphone-3.7.0/mediastreamer2/src/videofilters/videoenc.c 2014-04-19 17:07:06.339433637 +1000
-@@ -230,16 +230,16 @@
++++ linphone-3.7.0/mediastreamer2/src/videofilters/videoenc.c 2014-05-14 22:00:46.218868628 +1000
+@@ -230,17 +230,15 @@
static const MSVideoConfiguration * get_vconf_list(EncState *s) {
switch (s->codec) {
@@ -95,11 +95,11 @@
default:
return &mpeg4_conf_list[0];
- case CODEC_ID_SNOW:
-+ case AV_CODEC_ID_SNOW:
- return &snow_conf_list[0];
- }
- }
-@@ -262,19 +262,15 @@
+- return &snow_conf_list[0];
+ }
+ }
+
+@@ -262,19 +260,15 @@
}
static void enc_h263_init(MSFilter *f){
@@ -122,7 +122,7 @@
}
static void prepare(EncState *s){
-@@ -282,7 +278,7 @@
+@@ -282,7 +276,7 @@
const int max_br_vbv=128000;
avcodec_get_context_defaults3(c, NULL);
@@ -131,17 +131,17 @@
{
ms_message("Codec bitrate set to %i",c->bit_rate);
c->width = s->vconf.vsize.width;
-@@ -308,8 +304,7 @@
+@@ -308,8 +302,7 @@
/* ffmpeg vbv rate control consumes too much cpu above a certain target bitrate.
We don't use it above max_br_vbv */
- if (s->codec!=CODEC_ID_SNOW && s->vconf.required_bitrate<max_br_vbv){
- /*snow does not like 1st pass rate control*/
-+ if (s->maxbr<max_br_vbv){
++ if (s->vconf.required_bitrate<max_br_vbv){
c->rc_max_rate=c->bit_rate;
c->rc_min_rate=0;
c->rc_buffer_size=c->rc_max_rate;
-@@ -326,9 +321,6 @@
+@@ -326,9 +319,6 @@
c->gop_size=(int)s->vconf.fps*10; /*emit I frame every 10 seconds*/
c->pix_fmt=PIX_FMT_YUV420P;
s->comp_buf=allocb(c->bit_rate*2,0);
@@ -151,7 +151,7 @@
ms_message("Codec size set to w=%i/h=%i",c->width, c->height);
-@@ -343,7 +335,7 @@
+@@ -343,7 +333,7 @@
#endif
c->rtp_payload_size = s->mtu/2;
if (s->profile==0){
@@ -160,7 +160,7 @@
}else{
/*
c->flags|=CODEC_FLAG_H263P_UMV;
-@@ -352,7 +344,7 @@
+@@ -352,7 +342,7 @@
c->flags|=CODEC_FLAG_OBMC;
c->flags|=CODEC_FLAG_AC_PRED;
*/
@@ -169,7 +169,7 @@
}
}
-@@ -370,13 +362,11 @@
+@@ -370,13 +360,11 @@
EncState *s=(EncState*)f->data;
int error;
prepare(s);
@@ -186,7 +186,7 @@
/**/
}else {
ms_error("Unsupported codec id %i",s->codec);
-@@ -763,12 +753,12 @@
+@@ -763,12 +751,12 @@
uint8_t *psc;
uint32_t timestamp=f->ticker->time*90LL;
@@ -201,7 +201,7 @@
{
mblk_t *lqt=NULL;
mblk_t *cqt=NULL;
-@@ -805,8 +795,9 @@
+@@ -805,8 +793,9 @@
static void process_frame(MSFilter *f, mblk_t *inm){
EncState *s=(EncState*)f->data;
AVFrame pict;
@@ -212,7 +212,7 @@
mblk_t *comp_buf=s->comp_buf;
int comp_buf_sz=comp_buf->b_datap->db_lim-comp_buf->b_datap->db_base;
YuvBuf yuv;
-@@ -830,25 +821,19 @@
+@@ -830,25 +819,19 @@
s->req_vfu=FALSE;
}
comp_buf->b_rptr=comp_buf->b_wptr=comp_buf->b_datap->db_base;
@@ -244,7 +244,7 @@
ms_message("Emitting I-frame");
}
comp_buf->b_wptr+=packet.size;
-@@ -1026,22 +1011,6 @@
+@@ -1026,22 +1009,6 @@
methods
};
@@ -267,7 +267,7 @@
MSFilterDesc ms_mjpeg_enc_desc={
MS_JPEG_ENC_ID,
"MSJpegEnc",
-@@ -1108,26 +1077,6 @@
+@@ -1108,26 +1075,6 @@
.methods=methods
};
@@ -294,7 +294,7 @@
MSFilterDesc ms_mjpeg_enc_desc={
.id=MS_JPEG_ENC_ID,
.name="MSMJpegEnc",
-@@ -1148,15 +1097,13 @@
+@@ -1148,15 +1095,13 @@
void __register_ffmpeg_encoders_if_possible(void){
ms_ffmpeg_check_init();
@@ -315,8 +315,8 @@
}
Index: linphone-3.7.0/mediastreamer2/src/videofilters/jpegwriter.c
===================================================================
---- linphone-3.7.0.orig/mediastreamer2/src/videofilters/jpegwriter.c 2013-11-25 20:35:32.000000000 +1100
-+++ linphone-3.7.0/mediastreamer2/src/videofilters/jpegwriter.c 2014-04-19 17:11:44.602522497 +1000
+--- linphone-3.7.0.orig/mediastreamer2/src/videofilters/jpegwriter.c 2013-11-25 20:35:32.027783175 +1100
++++ linphone-3.7.0/mediastreamer2/src/videofilters/jpegwriter.c 2014-05-14 22:00:11.543464237 +1000
@@ -36,9 +36,9 @@
static void jpg_init(MSFilter *f){
@@ -366,7 +366,7 @@
Index: linphone-3.7.0/mediastreamer2/src/videofilters/videodec.c
===================================================================
--- linphone-3.7.0.orig/mediastreamer2/src/videofilters/videodec.c 2014-02-08 04:46:30.151313750 +1100
-+++ linphone-3.7.0/mediastreamer2/src/videofilters/videodec.c 2014-04-19 17:15:27.910585716 +1000
++++ linphone-3.7.0/mediastreamer2/src/videofilters/videodec.c 2014-05-14 22:00:11.543464237 +1000
@@ -44,7 +44,6 @@
uint8_t dci[512];
int dci_size;
@@ -521,8 +521,8 @@
MS_FILTER_DESC_EXPORT(ms_jpeg_dec_desc)
Index: linphone-3.7.0/mediastreamer2/src/videofilters/h264dec.c
===================================================================
---- linphone-3.7.0.orig/mediastreamer2/src/videofilters/h264dec.c 2014-02-08 20:09:25.000000000 +1100
-+++ linphone-3.7.0/mediastreamer2/src/videofilters/h264dec.c 2014-04-19 16:50:11.285417732 +1000
+--- linphone-3.7.0.orig/mediastreamer2/src/videofilters/h264dec.c 2014-02-08 20:09:25.402547365 +1100
++++ linphone-3.7.0/mediastreamer2/src/videofilters/h264dec.c 2014-05-14 22:00:11.543464237 +1000
@@ -56,7 +56,7 @@
static void dec_open(DecData *d){
AVCodec *codec;
@@ -534,8 +534,8 @@
error=avcodec_open2(&d->av_context,codec, NULL);
Index: linphone-3.7.0/mediastreamer2/build/iphone/voipdescs.h
===================================================================
---- linphone-3.7.0.orig/mediastreamer2/build/iphone/voipdescs.h 2013-05-30 18:09:06.000000000 +1000
-+++ linphone-3.7.0/mediastreamer2/build/iphone/voipdescs.h 2014-04-19 16:50:11.285417732 +1000
+--- linphone-3.7.0.orig/mediastreamer2/build/iphone/voipdescs.h 2013-05-30 18:09:06.037701323 +1000
++++ linphone-3.7.0/mediastreamer2/build/iphone/voipdescs.h 2014-05-14 22:00:11.543464237 +1000
@@ -26,7 +26,6 @@
extern MSFilterDesc ms_mpeg4_dec_desc;
extern MSFilterDesc ms_h263_dec_desc;
@@ -555,7 +555,7 @@
Index: linphone-3.7.0/mediastreamer2/build/win32native/voipdescs.h
===================================================================
--- linphone-3.7.0.orig/mediastreamer2/build/win32native/voipdescs.h 2012-09-12 19:34:36.000000000 +1000
-+++ linphone-3.7.0/mediastreamer2/build/win32native/voipdescs.h 2014-04-19 16:50:11.285417732 +1000
++++ linphone-3.7.0/mediastreamer2/build/win32native/voipdescs.h 2014-05-14 22:00:11.543464237 +1000
@@ -24,8 +24,6 @@
extern MSFilterDesc ms_mpeg4_enc_desc;
extern MSFilterDesc ms_mpeg4_dec_desc;
More information about the Pkg-voip-commits
mailing list