[Pkg-voip-commits] r10479 - in /linphone/trunk/debian: changelog patches/libav10.patch
msp at alioth.debian.org
msp at alioth.debian.org
Sat Jun 14 00:42:10 UTC 2014
Author: msp
Date: Sat Jun 14 00:42:10 2014
New Revision: 10479
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10479
Log:
TODO: fixup 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=10479&op=diff
==============================================================================
--- linphone/trunk/debian/changelog (original)
+++ linphone/trunk/debian/changelog Sat Jun 14 00:42:10 2014
@@ -12,7 +12,7 @@
updated debian/control (Closes: #743652)
* Add Build-Depends: polarssl, gsm1
* Fix "FTBFS with libav10" upload to unstable (Closes: #739314)
- * Refresh libav10.patch
+ * TODO: fixup 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=10479&op=diff
==============================================================================
--- linphone/trunk/debian/patches/libav10.patch (original)
+++ linphone/trunk/debian/patches/libav10.patch Sat Jun 14 00:42:10 2014
@@ -6,7 +6,7 @@
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.866143371 +1100
-+++ linphone-3.7.0/mediastreamer2/src/videofilters/nowebcam.c 2014-05-14 22:00:11.539464306 +1000
++++ linphone-3.7.0/mediastreamer2/src/videofilters/nowebcam.c 2014-05-14 22:42:12.578850465 +1000
@@ -56,20 +56,25 @@
#ifndef NO_FFMPEG
AVCodecContext av_context;
@@ -76,7 +76,7 @@
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-05-14 22:00:46.218868628 +1000
++++ linphone-3.7.0/mediastreamer2/src/videofilters/videoenc.c 2014-05-14 22:42:12.578850465 +1000
@@ -230,17 +230,15 @@
static const MSVideoConfiguration * get_vconf_list(EncState *s) {
@@ -316,7 +316,7 @@
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.027783175 +1100
-+++ linphone-3.7.0/mediastreamer2/src/videofilters/jpegwriter.c 2014-05-14 22:00:11.543464237 +1000
++++ linphone-3.7.0/mediastreamer2/src/videofilters/jpegwriter.c 2014-05-14 22:45:12.495651308 +1000
@@ -36,9 +36,9 @@
static void jpg_init(MSFilter *f){
@@ -342,11 +342,14 @@
mblk_t *jpegm;
struct SwsContext *sws_ctx;
struct AVPacket packet;
-@@ -131,16 +130,17 @@
+@@ -130,17 +129,19 @@
+
avcodec_get_frame_defaults(&pict);
avpicture_fill((AVPicture*)&pict,(uint8_t*)jpegm->b_rptr,avctx->pix_fmt,avctx->width,avctx->height);
- packet.data=comp_buf; packet.size=comp_buf_sz;
+- packet.data=comp_buf; packet.size=comp_buf_sz;
- error=avcodec_encode_video2(avctx, &packet, &pict, &got_pict);
++ pkt.data = (uint8_t *)comp_buf->b_wptr;
++ pkt.size = comp_buf_sz;
+ error=avcodec_encode_video2(avctx, &pkt, &pict, &got_output);
if (error<0){
ms_error("Could not encode jpeg picture.");
@@ -366,7 +369,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-05-14 22:00:11.543464237 +1000
++++ linphone-3.7.0/mediastreamer2/src/videofilters/videodec.c 2014-05-14 22:42:12.582850392 +1000
@@ -44,7 +44,6 @@
uint8_t dci[512];
int dci_size;
@@ -522,7 +525,7 @@
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.402547365 +1100
-+++ linphone-3.7.0/mediastreamer2/src/videofilters/h264dec.c 2014-05-14 22:00:11.543464237 +1000
++++ linphone-3.7.0/mediastreamer2/src/videofilters/h264dec.c 2014-05-14 22:42:12.582850392 +1000
@@ -56,7 +56,7 @@
static void dec_open(DecData *d){
AVCodec *codec;
@@ -535,7 +538,7 @@
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.037701323 +1000
-+++ linphone-3.7.0/mediastreamer2/build/iphone/voipdescs.h 2014-05-14 22:00:11.543464237 +1000
++++ linphone-3.7.0/mediastreamer2/build/iphone/voipdescs.h 2014-05-14 22:42:12.582850392 +1000
@@ -26,7 +26,6 @@
extern MSFilterDesc ms_mpeg4_dec_desc;
extern MSFilterDesc ms_h263_dec_desc;
@@ -555,7 +558,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-05-14 22:00:11.543464237 +1000
++++ linphone-3.7.0/mediastreamer2/build/win32native/voipdescs.h 2014-05-14 22:42:12.582850392 +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