[Pkg-voip-commits] [pjproject] 21/45: change version to 2.4.5~dfsg-5 (UNRELEASED) Update patches to not mess with autogenerated files.
Jonas Smedegaard
dr at jones.dk
Tue Jun 7 22:01:23 UTC 2016
This is an automated email from the git hooks/post-receive script.
js pushed a commit to branch master
in repository pjproject.
commit 63e3177240a5965d9aebc82f1e4b928415dce8cc
Merge: 709842b 24cd21c
Author: Jonas Smedegaard <dr at jones.dk>
Date: Tue Jun 7 14:23:42 2016 +0200
change version to 2.4.5~dfsg-5 (UNRELEASED)
Update patches to not mess with autogenerated files.
aconfigure | 31 +++------
debian/.git-dpm | 4 +-
debian/changelog | 6 ++
...1-Remove-pointless-linking-with-libasound.patch | 18 +-----
...uce-number-of-libraries-linked-with-pjlib.patch | 44 +------------
...e-number-of-libraries-linked-with-pjmedia.patch | 2 +-
.../0004-Enable-building-python-bindings.patch | 2 +-
.../0005-CODEC_ID_-changed-to-AV_CODEC_ID_.patch | 2 +-
...o-libs-dependency-for-pj-utils-and-pjnath.patch | 2 +-
.../0007-Reduce-linkage-of-unused-libraries.patch | 73 +---------------------
.../0008-Replace-deprecated-FFmpeg-API.patch | 2 +-
...09-add-v5-suffix-to-soname-of-libpjsua2-2.patch | 2 +-
12 files changed, 29 insertions(+), 159 deletions(-)
diff --cc debian/.git-dpm
index add1796,0000000..12e711e
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- c9d40b9830767ef21a09eaa15272f9ca0ce08bfc
- c9d40b9830767ef21a09eaa15272f9ca0ce08bfc
++24cd21cda01347fb146bbc7c41bdbdc89db85439
++24cd21cda01347fb146bbc7c41bdbdc89db85439
+8bc494943161dfa21ff5d95e9ec78efd4f35e408
+8bc494943161dfa21ff5d95e9ec78efd4f35e408
+pjproject_2.4.5~dfsg.orig.tar.bz2
+be4b2b7739c3d02d6265a4cc2ca0661df38dd151
+4449242
diff --cc debian/changelog
index 6cf3790,0000000..03be04f
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,123 -1,0 +1,129 @@@
++pjproject (2.4.5~dfsg-5) UNRELEASED; urgency=medium
++
++ * Update patches to not mess with autogenerated files.
++
++ -- Jonas Smedegaard <dr at jones.dk> Tue, 07 Jun 2016 14:23:43 +0200
++
+pjproject (2.4.5~dfsg-4) unstable; urgency=medium
+
+ * Fix avoid build-depending on libv4l-dev on the Hurd:
+ + Adapt symbols.
+ + Resolve libpjproject-dev dependencies related to linked libraries
+ during build.
+ + Build-depend on d-shlibs.
+ * Modernize Vcs-* field URLs:
+ + Use https protocol.
+ + Use cgit viewer.
+ * Build-depend unversioned on debhelper: Needed version satisfied even
+ in oldstable.
+ * Add lintian override regarding debhelper 9.
+ * Declare compliance with Debian Policy 3.9.7.
+ * Update symbols file (affects only optional symbols).
+ * Fix stop have libpjproject-dev depend on libx264-dev: Seems unused.
+
+ -- Jonas Smedegaard <dr at jones.dk> Fri, 01 Apr 2016 15:03:42 +0200
+
+pjproject (2.4.5~dfsg-3) unstable; urgency=medium
+
+ * Update symbois.
+
+ -- Jonas Smedegaard <dr at jones.dk> Fri, 25 Mar 2016 19:22:31 +0100
+
+pjproject (2.4.5~dfsg-2) unstable; urgency=medium
+
+ * Move packaging to Debian VoIP team (with Tzafrir's consent).
+ Add myself as uploader.
+ * Use pkgkde-symbolshelper. Build-depend on pkg-kde-tools.
+
+ -- Jonas Smedegaard <dr at jones.dk> Fri, 25 Mar 2016 17:09:28 +0100
+
+pjproject (2.4.5~dfsg-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ upstream ]
+ * New release(s).
+ + Use the OpenSSL RNG if available, instead of via SRTP.
+ Closes: Bug#793972.
+ + Support compilation with OpenSSL without OpenSSLv3 support.
+ Closes: Bug#805082. Thanks to Peter Green.
+
+ [ Tzafrir Cohen ]
+ * Fix add Files section for bar-descriptor.xml to debian/copyright.
+ Closes: #793051. Thanks to Thorsten Alteholz.
+ * Move arch-dependent headers to a triplet subdir.
+ Closes: #793097. Thanks to Jakub Wilk.
+ * Bump soname for libpjsua2: Add C++ transitional v5 suffix.
+ Closes: Bug#793094. Thanks to Jakub Wilk and Simon McVittie.
+ * Replace deprecated FFmpeg API.
+ Closes: Bug#803855, #801535. Thanks to Andreas Cadhalpun.
+ * Copy -dev build deps to deps of -dev package.
+ Closes: #795825, #801535. Thanks to Julien Cristau, Simon McVittie
+ and Andreas Beckmann.
+
+ [ Jeremy Lainé ]
+ * Reduce library linkage.
+ Closes: Bug#793141. Thanks to James Cloos.
+
+ [ Jonas Smedegaard ]
+ * Fix typo in long descriptions.
+ * Build-depend on virtual libsrtp-dev (not libsrtp0-dev) to ease
+ pending transition.
+ * Fix have libpjproject-dev depend on libpjsua2-2v5 (not libpjsua2-2).
+ * Fix add version mangling hint to watch file.
+ * Fix strip debian revision from symbols files.
+
+ -- Jonas Smedegaard <dr at jones.dk> Mon, 21 Mar 2016 11:42:57 +0100
+
+pjproject (2.4~dfsg-1) unstable; urgency=low
+
+ * New upstream release: now an upstream version (Closes: #725326).
+ - Update symbols for version 2.3, 2.4
+ - We use upstream source. No need for the README
+ - rules: config_site moved
+ - CODEC_ID_* changed to AV_CODEC_ID_*
+ - Extra library: pjsua2 (libpjsua2-2. Package libpjsua2 is pjsua).
+ * -dev package: depend explicitly on libsrtp0-dev due to -lsrtp in
+ the pkg-config file.
+ * rules: run 'make dep' at build time.
+ * rules: 'build' not cnfused by directory 'build'
+ * Enable opencore-amr codec support
+ * Do enable IPv6 support in config_site (Closes: #787964).
+ * README.source: we use git-dpm
+ * Do enable video
+ * compat level 9
+ * multi-arch support
+ - control: packages pre-depend on multi-arch
+ * Remove offending build flags from pkgconfig file (lintian).
+ * A disabled tests target
+ * extra files to remove after tests
+ * Reduce number of libraries linked with pjlib-util
+ * copyright: Fix syntax (gsm)
+ * Remove video libs dependency for pj-utils and pjnath
+ * package python-pjproject (Closes: #768578)
+ - Depend on python-dev
+ * Standards version 3.9.6 (no change needed)
+ * copyright: Don't use '[]' wildcards
+
+ -- Tzafrir Cohen <tzafrir at debian.org> Sun, 28 Jun 2015 23:53:29 +0300
+
+pjproject (2.1.0.0.ast20130823-1) unstable; urgency=low
+
+ [ Jeremy Lainé ]
+ * Fix dh_auto_clean on an unconfigured source tree (Closes: #722013).
+ * Fix syntax error in machine-readable debian/copyright.
+ * Update Standards-Version to 3.9.4 (no changes).
+
+ [ Tzafrir Cohen ]
+ * Further copyright fixes.
+ * New upstream git snapshot:
+ pkgconfig_nodestdir.patch, soname.patch dropped: merged upstream.
+ * fix_gcc_warn.patch: remove some build warnings.
+
+ -- Tzafrir Cohen <tzafrir at debian.org> Thu, 12 Sep 2013 16:53:51 +0300
+
+pjproject (2.1.0~ast20130801-1) unstable; urgency=low
+
+ * Initial release. (Closes: #708122)
+
+ -- Tzafrir Cohen <tzafrir at debian.org> Wed, 07 Aug 2013 22:20:07 +0300
diff --cc debian/patches/0001-Remove-pointless-linking-with-libasound.patch
index 34a05a1,0000000..c2f02fa
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-pointless-linking-with-libasound.patch
+++ b/debian/patches/0001-Remove-pointless-linking-with-libasound.patch
@@@ -1,41 -1,0 +1,27 @@@
- From 47cd036dddae3bac96e78fef557b9859c44427b6 Mon Sep 17 00:00:00 2001
++From 14ef4deafe2cae51e2100a4897665c489476bafb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine at m4x.org>
+Date: Thu, 30 Oct 2014 08:09:41 +0200
+Subject: Remove pointless linking with libasound
+
+Upstream: no
+
+All libraries and applications were being linked against libasound,
+but it was not being used anywhere.
+
+Upstream says: this cannot be merged as-is.
+---
- aconfigure | 2 --
+ aconfigure.ac | 1 -
- 2 files changed, 3 deletions(-)
++ 1 file changed, 1 deletion(-)
+
- diff --git a/aconfigure b/aconfigure
- index 83fc5d7..42c5da6 100755
- --- a/aconfigure
- +++ b/aconfigure
- @@ -6102,8 +6102,6 @@ $as_echo "Checking sound device backend... null sound" >&6; }
- if test "x$ac_cv_header_alsa_version_h" = xyes; then :
- ac_pa_use_alsa=1
-
- - LIBS="$LIBS -lasound"
- -
- else
- ac_pa_use_alsa=0
-
+diff --git a/aconfigure.ac b/aconfigure.ac
+index 179dfac..e86e27c 100644
+--- a/aconfigure.ac
++++ b/aconfigure.ac
+@@ -654,7 +654,6 @@ else
+ ac_pjmedia_snd=pa_unix
+ AC_CHECK_HEADER(alsa/version.h,
+ [AC_SUBST(ac_pa_use_alsa,1)
+- LIBS="$LIBS -lasound"
+ ],
+ [AC_SUBST(ac_pa_use_alsa,0)])
+ AC_MSG_RESULT([Checking sound device backend... unix])
diff --cc debian/patches/0002-Reduce-number-of-libraries-linked-with-pjlib.patch
index b077aa5,0000000..4ea154f
mode 100644,000000..100644
--- a/debian/patches/0002-Reduce-number-of-libraries-linked-with-pjlib.patch
+++ b/debian/patches/0002-Reduce-number-of-libraries-linked-with-pjlib.patch
@@@ -1,104 -1,0 +1,64 @@@
- From 0498e9e2daf6f160258b13de4ee13eb94b747195 Mon Sep 17 00:00:00 2001
++From c19ac09a2637e0f32186d37a272c204c237f7070 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine at m4x.org>
+Date: Thu, 30 Oct 2014 08:09:42 +0200
+Subject: Reduce number of libraries linked with pjlib
+
+All libraries and applications were gratuitously linked against
+libcrypto, libssl and libuuid, but only libpj needs them.
+---
- aconfigure | 7 ++++---
+ aconfigure.ac | 7 ++++---
+ build.mak.in | 2 ++
+ pjlib/build/Makefile | 2 +-
- 4 files changed, 11 insertions(+), 7 deletions(-)
++ 3 files changed, 7 insertions(+), 4 deletions(-)
+
- diff --git a/aconfigure b/aconfigure
- index 42c5da6..eb50910 100755
- --- a/aconfigure
- +++ b/aconfigure
- @@ -620,6 +620,7 @@ ac_includes_default="\
-
- ac_subst_vars='LTLIBOBJS
- LIBOBJS
- +PJLIB_EXT
- ac_main_obj
- ac_host
- ac_linux_poll
- @@ -4213,7 +4214,7 @@ if test "x$ac_cv_lib_uuid_uuid_generate" = xyes; then :
- #define HAVE_LIBUUID 1
- _ACEOF
-
- - LIBS="-luuid $LIBS"
- + PJLIB_EXT="-luuid $PJLIB_EXT"
-
- fi
-
- @@ -7705,7 +7706,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_ERR_load_BIO_strings" >&5
- $as_echo "$ac_cv_lib_crypto_ERR_load_BIO_strings" >&6; }
- if test "x$ac_cv_lib_crypto_ERR_load_BIO_strings" = xyes; then :
- - libcrypto_present=1 && LIBS="-lcrypto $LIBS"
- + libcrypto_present=1 && PJLIB_EXT="-lcrypto $PJLIB_EXT"
- fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
- @@ -7745,7 +7746,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
- $as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
- if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
- - libssl_present=1 && LIBS="-lssl $LIBS"
- + libssl_present=1 && PJLIB_EXT="-lssl $PJLIB_EXT"
- fi
-
- if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then
+diff --git a/aconfigure.ac b/aconfigure.ac
+index e86e27c..72446dd 100644
+--- a/aconfigure.ac
++++ b/aconfigure.ac
+@@ -114,7 +114,8 @@ AC_CHECK_LIB(winmm,puts)
+ AC_CHECK_LIB(socket,puts)
+ AC_CHECK_LIB(rt,puts)
+ AC_CHECK_LIB(m,sin)
+-AC_CHECK_LIB(uuid,uuid_generate)
++AC_SUBST(PJLIB_EXT)
++AC_CHECK_LIB(uuid,uuid_generate,[PJLIB_EXT="-luuid $PJLIB_EXT"])
+ AC_CHECK_LIB(uuid,uuid_generate,[ac_has_uuid_lib=1])
+ AC_SEARCH_LIBS(gethostbyname,nsl)
+
+@@ -1532,8 +1533,8 @@ AC_ARG_ENABLE(ssl,
+ AC_SUBST(libssl_present)
+ AC_SUBST(libcrypto_present)
+ AC_CHECK_HEADER(openssl/ssl.h,[openssl_h_present=1])
+- AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && LIBS="-lcrypto $LIBS"])
+- AC_CHECK_LIB(ssl,SSL_library_init,[libssl_present=1 && LIBS="-lssl $LIBS"])
++ AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && PJLIB_EXT="-lcrypto $PJLIB_EXT"])
++ AC_CHECK_LIB(ssl,SSL_library_init,[libssl_present=1 && PJLIB_EXT="-lssl $PJLIB_EXT"])
+ if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then
+ AC_MSG_RESULT([OpenSSL library found, SSL support enabled])
+ # PJSIP_HAS_TLS_TRANSPORT setting follows PJ_HAS_SSL_SOCK
+diff --git a/build.mak.in b/build.mak.in
+index 074977d..1add583 100644
+--- a/build.mak.in
++++ b/build.mak.in
+@@ -28,6 +28,8 @@ export APP_THIRD_PARTY_EXT :=
+ export APP_THIRD_PARTY_LIBS :=
+ export APP_THIRD_PARTY_LIB_FILES :=
+
++PJLIB_EXT = @PJLIB_EXT@
++
+ ifeq (@ac_external_srtp@,1)
+ # External SRTP library
+ APP_THIRD_PARTY_EXT += -lsrtp
+diff --git a/pjlib/build/Makefile b/pjlib/build/Makefile
+index 1e64950..2bd2b90 100644
+--- a/pjlib/build/Makefile
++++ b/pjlib/build/Makefile
+@@ -39,7 +39,7 @@ export PJLIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
+ string.o timer.o types.o
+ export PJLIB_CFLAGS += $(_CFLAGS)
+ export PJLIB_CXXFLAGS += $(_CXXFLAGS)
+-export PJLIB_LDFLAGS += $(_LDFLAGS)
++export PJLIB_LDFLAGS += $(PJLIB_EXT) $(_LDFLAGS)
+
+ ###############################################################################
+ # Defines for building test application
diff --cc debian/patches/0003-Reduce-number-of-libraries-linked-with-pjmedia.patch
index 3f4d6c9,0000000..f860dcd
mode 100644,000000..100644
--- a/debian/patches/0003-Reduce-number-of-libraries-linked-with-pjmedia.patch
+++ b/debian/patches/0003-Reduce-number-of-libraries-linked-with-pjmedia.patch
@@@ -1,73 -1,0 +1,73 @@@
- From 8cc3c5d59c3f19f4038fad879381cd383b7cd659 Mon Sep 17 00:00:00 2001
++From 8ef6c96798adeab34a7b25aed593af66cba056c4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine at m4x.org>
+Date: Thu, 30 Oct 2014 08:09:43 +0200
+Subject: Reduce number of libraries linked with pjmedia
+
+All libraries and applications were gratuitously linked against
+libgsm, libportaudio, libspeex and libspeexdsp but only pjmedia
+needs them.
+---
+ build.mak.in | 7 ++++---
+ pjmedia/build/Makefile | 3 +++
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/build.mak.in b/build.mak.in
+index 1add583..faa9c98 100644
+--- a/build.mak.in
++++ b/build.mak.in
+@@ -62,7 +62,7 @@ endif
+ ifneq (@ac_no_gsm_codec@,1)
+ ifeq (@ac_external_gsm@,1)
+ # External GSM library
+-APP_THIRD_PARTY_EXT += -lgsm
++PJMEDIA_CODEC_EXT += -lgsm
+ else
+ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libgsmcodec-$(LIB_SUFFIX)
+ ifeq ($(PJ_SHARED_LIBRARIES),)
+@@ -76,7 +76,8 @@ endif
+
+ ifneq (@ac_no_speex_codec@,1)
+ ifeq (@ac_external_speex@,1)
+-APP_THIRD_PARTY_EXT += -lspeex -lspeexdsp
++PJMEDIA_EXT += -lspeexdsp
++PJMEDIA_CODEC_EXT += -lspeex
+ else
+ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libspeex-$(LIB_SUFFIX)
+ ifeq ($(PJ_SHARED_LIBRARIES),)
+@@ -111,7 +112,7 @@ endif
+ ifneq ($(findstring pa, at ac_pjmedia_snd@),)
+ ifeq (@ac_external_pa@,1)
+ # External PA
+-APP_THIRD_PARTY_EXT += -lportaudio
++PJMEDIA_AUDIODEV_EXT += -lportaudio
+ else
+ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libportaudio-$(LIB_SUFFIX)
+ ifeq ($(PJ_SHARED_LIBRARIES),)
+diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
+index 702efdc..340bfc4 100644
+--- a/pjmedia/build/Makefile
++++ b/pjmedia/build/Makefile
+@@ -84,6 +84,7 @@ export PJMEDIA_LDFLAGS += $(PJMEDIA_VIDEODEV_LDLIB) \
+ $(PJLIB_LDLIB) \
+ $(PJLIB_UTIL_LDLIB) \
+ $(PJNATH_LDLIB) \
++ $(PJMEDIA_EXT) \
+ $(_LDFLAGS)
+
+
+@@ -98,6 +99,7 @@ export PJMEDIA_AUDIODEV_OBJS += audiodev.o audiotest.o errno.o \
+ export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS)
+ export PJMEDIA_AUDIODEV_CXXFLAGS += $(_CXXFLAGS)
+ export PJMEDIA_AUDIODEV_LDFLAGS += $(PJLIB_LDLIB) \
++ $(PJMEDIA_AUDIODEV_EXT) \
+ $(_LDFLAGS)
+
+
+@@ -146,6 +148,7 @@ export PJMEDIA_CODEC_CXXFLAGS += $(_CXXFLAGS) $(GSM_CFLAGS) $(SPEEX_CFLAGS) \
+ $(ILBC_CFLAGS) $(IPP_CFLAGS) $(G7221_CFLAGS)
+ export PJMEDIA_CODEC_LDFLAGS += $(PJMEDIA_LDLIB) \
+ $(PJLIB_LDLIB) \
++ $(PJMEDIA_CODEC_EXT) \
+ $(_LDFLAGS)
+
+ ###############################################################################
diff --cc debian/patches/0004-Enable-building-python-bindings.patch
index 3aa0bea,0000000..4288eb1
mode 100644,000000..100644
--- a/debian/patches/0004-Enable-building-python-bindings.patch
+++ b/debian/patches/0004-Enable-building-python-bindings.patch
@@@ -1,21 -1,0 +1,21 @@@
- From 8b0626ecfcfcfa7ab676e5bec7a3623a4f347d9f Mon Sep 17 00:00:00 2001
++From 7e0432730b897797d9cbef2e272670a7b76d44a6 Mon Sep 17 00:00:00 2001
+From: Tzafrir Cohen <tzafrir at debian.org>
+Date: Thu, 30 Oct 2014 08:09:44 +0200
+Subject: Enable building python bindings
+
+---
+ Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile b/Makefile
+index 20af077..1dfac1f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,6 +4,7 @@ include build/host-$(HOST_NAME).mak
+ include version.mak
+
+ LIB_DIRS = pjlib/build pjlib-util/build pjnath/build third_party/build pjmedia/build pjsip/build
++EXTRA_DIRS = pjsip-apps/src/python
+ DIRS = $(LIB_DIRS) pjsip-apps/build $(EXTRA_DIRS)
+
+ ifdef MINSIZE
diff --cc debian/patches/0005-CODEC_ID_-changed-to-AV_CODEC_ID_.patch
index 9d26fd6,0000000..c1496b6
mode 100644,000000..100644
--- a/debian/patches/0005-CODEC_ID_-changed-to-AV_CODEC_ID_.patch
+++ b/debian/patches/0005-CODEC_ID_-changed-to-AV_CODEC_ID_.patch
@@@ -1,36 -1,0 +1,36 @@@
- From 054f4253a2f2584d134997ed2fc5814226bd5a64 Mon Sep 17 00:00:00 2001
++From 0bba0c4fbb982e50ee2617817f9f7066d6b4e35c Mon Sep 17 00:00:00 2001
+From: Tzafrir Cohen <tzafrir at debian.org>
+Date: Thu, 30 Oct 2014 09:15:03 +0200
+Subject: CODEC_ID_* changed to AV_CODEC_ID_*
+
+---
+ pjmedia/src/pjmedia/ffmpeg_util.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/pjmedia/src/pjmedia/ffmpeg_util.c b/pjmedia/src/pjmedia/ffmpeg_util.c
+index ba01a3c..300bad3 100644
+--- a/pjmedia/src/pjmedia/ffmpeg_util.c
++++ b/pjmedia/src/pjmedia/ffmpeg_util.c
+@@ -68,14 +68,14 @@ static const struct ffmpeg_codec_table_t
+ unsigned codec_id;
+ } ffmpeg_codec_table[] =
+ {
+- {PJMEDIA_FORMAT_H261, CODEC_ID_H261},
+- {PJMEDIA_FORMAT_H263, CODEC_ID_H263},
+- {PJMEDIA_FORMAT_H263P, CODEC_ID_H263P},
+- {PJMEDIA_FORMAT_H264, CODEC_ID_H264},
+- {PJMEDIA_FORMAT_MPEG1VIDEO, CODEC_ID_MPEG1VIDEO},
+- {PJMEDIA_FORMAT_MPEG2VIDEO, CODEC_ID_MPEG2VIDEO},
+- {PJMEDIA_FORMAT_MPEG4, CODEC_ID_MPEG4},
+- {PJMEDIA_FORMAT_MJPEG, CODEC_ID_MJPEG}
++ {PJMEDIA_FORMAT_H261, AV_CODEC_ID_H261},
++ {PJMEDIA_FORMAT_H263, AV_CODEC_ID_H263},
++ {PJMEDIA_FORMAT_H263P, AV_CODEC_ID_H263P},
++ {PJMEDIA_FORMAT_H264, AV_CODEC_ID_H264},
++ {PJMEDIA_FORMAT_MPEG1VIDEO, AV_CODEC_ID_MPEG1VIDEO},
++ {PJMEDIA_FORMAT_MPEG2VIDEO, AV_CODEC_ID_MPEG2VIDEO},
++ {PJMEDIA_FORMAT_MPEG4, AV_CODEC_ID_MPEG4},
++ {PJMEDIA_FORMAT_MJPEG, AV_CODEC_ID_MJPEG}
+ };
+
+ static int pjmedia_ffmpeg_ref_cnt;
diff --cc debian/patches/0006-Remove-video-libs-dependency-for-pj-utils-and-pjnath.patch
index 808eb21,0000000..c76a662
mode 100644,000000..100644
--- a/debian/patches/0006-Remove-video-libs-dependency-for-pj-utils-and-pjnath.patch
+++ b/debian/patches/0006-Remove-video-libs-dependency-for-pj-utils-and-pjnath.patch
@@@ -1,52 -1,0 +1,52 @@@
- From 93d80f235e2aaaf50d467b62fc111c866578ab23 Mon Sep 17 00:00:00 2001
++From 02756cc4c005bb5ef889c8057a62d6344ef3e0b1 Mon Sep 17 00:00:00 2001
+From: Tzafrir Cohen <tzafrir at debian.org>
+Date: Fri, 31 Oct 2014 23:14:49 +0200
+Subject: Remove video libs dependency for pj-utils and pjnath
+
+The video LD flags were duplicated on the app LD flags and the HOST
+LD flags. Remove them from the app LD flags. Remove HOST_LDFLAGS for
+some projects.
+---
+ build.mak.in | 1 -
+ pjlib-util/build/Makefile | 2 +-
+ pjnath/build/Makefile | 2 +-
+ 3 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/build.mak.in b/build.mak.in
+index faa9c98..5c4fc40 100644
+--- a/build.mak.in
++++ b/build.mak.in
+@@ -186,7 +186,6 @@ export APP_LDFLAGS := -L$(PJDIR)/pjlib/lib\
+ -L$(PJDIR)/pjmedia/lib\
+ -L$(PJDIR)/pjsip/lib\
+ -L$(PJDIR)/third_party/lib\
+- $(PJ_VIDEO_LDFLAGS) \
+ @LDFLAGS@
+ export APP_LDXXFLAGS := $(APP_LDFLAGS)
+
+diff --git a/pjlib-util/build/Makefile b/pjlib-util/build/Makefile
+index cb601cb..a03a558 100644
+--- a/pjlib-util/build/Makefile
++++ b/pjlib-util/build/Makefile
+@@ -28,7 +28,7 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
+ $(CFLAGS) $(CC_INC)../include $(CC_INC)../../pjlib/include
+ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
+ $(HOST_CXXFLAGS) $(CXXFLAGS)
+-export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
++export _LDFLAGS := $(CC_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
+ $(APP_LDFLAGS) $(LDFLAGS)
+
+ ###############################################################################
+diff --git a/pjnath/build/Makefile b/pjnath/build/Makefile
+index 1bc08b5..5f08a8a 100644
+--- a/pjnath/build/Makefile
++++ b/pjnath/build/Makefile
+@@ -30,7 +30,7 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
+ $(CC_INC)../../pjlib-util/include
+ export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
+ $(HOST_CXXFLAGS) $(CXXFLAGS)
+-export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
++export _LDFLAGS := $(CC_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
+ $(APP_LDFLAGS) $(LDFLAGS)
+
+ ###############################################################################
diff --cc debian/patches/0007-Reduce-linkage-of-unused-libraries.patch
index 102deb3,0000000..b4a719a
mode 100644,000000..100644
--- a/debian/patches/0007-Reduce-linkage-of-unused-libraries.patch
+++ b/debian/patches/0007-Reduce-linkage-of-unused-libraries.patch
@@@ -1,211 -1,0 +1,142 @@@
- From df5f5ffdfa45cc3975c18279ac0b44212b00370f Mon Sep 17 00:00:00 2001
++From baade10faadee85cfd996e776dc05225f35c3599 Mon Sep 17 00:00:00 2001
+From: Tzafrir Cohen <tzafrir at debian.org>
+Date: Thu, 13 Aug 2015 17:49:57 +0200
+Subject: Reduce linkage of unused libraries
+
+The following libraries: ffmpeg, v4l, opencore-amr and SDL are linked
+with all the libraries. But are only needed for a small part of them.
+
+Have them linked with the relevant ones explicitly.
+---
- aconfigure | 22 ++++++++++++++++++----
+ aconfigure.ac | 24 +++++++++++++++++++-----
+ build.mak.in | 5 +++++
+ pjlib-util/build/Makefile | 2 +-
+ pjmedia/build/Makefile | 1 +
+ pjnath/build/Makefile | 3 ++-
- 6 files changed, 46 insertions(+), 11 deletions(-)
++ 5 files changed, 28 insertions(+), 7 deletions(-)
+
- diff --git a/aconfigure b/aconfigure
- index eb50910..cbebe1c 100755
- --- a/aconfigure
- +++ b/aconfigure
- @@ -621,6 +621,11 @@ ac_includes_default="\
- ac_subst_vars='LTLIBOBJS
- LIBOBJS
- PJLIB_EXT
- +PJLIB_UTIL_EXT
- +PJMEDIA_EXT
- +PJMEDIA_CODEC_EXT
- +PJMEDIA_VIDEODEV_EXT
- +PJNATH_EXT
- ac_main_obj
- ac_host
- ac_linux_poll
- @@ -6647,7 +6652,9 @@ $as_echo "not found" >&6; }
- ac_sdl_cflags=`$SDL_CONFIG --cflags`
- ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags"
- ac_sdl_ldflags=`$SDL_CONFIG --libs`
- - LIBS="$LIBS $ac_sdl_ldflags"
- + PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT $ac_sdl_ldflags"
- + PJMEDIA_VIDEODEV_EXT="$PJMEDIA_VIDEODEV_EXT $ac_sdl_ldflags"
- + PJNATH_EXT="$PJNATH_EXT $ac_sdl_ldflags"
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Unsupported SDL version" >&5
- $as_echo "Unsupported SDL version" >&6; }
- @@ -7050,7 +7057,11 @@ fi
-
- fi
-
- - LIBS="$LIBS $ac_ffmpeg_ldflags"
- + PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT $ac_ffmpeg_ldflags"
- + PJMEDIA_EXT="$PJMEDIA_EXT $ac_ffmpeg_ldflags"
- + PJMEDIA_CODEC_EXT="$PJMEDIA_CODEC_EXT $ac_ffmpeg_ldflags"
- + # FIXME: only needs libavutil
- + PJNATH_EXT="$PJNATH_EXT $ac_ffmpeg_ldflags"
- export PKG_CONFIG_PATH=$SAVED_PKG_CONFIG_PATH
-
-
- @@ -7108,7 +7119,9 @@ $as_echo "$ac_cv_lib_v4l2_v4l2_open" >&6; }
- if test "x$ac_cv_lib_v4l2_v4l2_open" = xyes; then :
- ac_v4l2_cflags="-DPJMEDIA_VIDEO_DEV_HAS_V4L2=1"
- ac_v4l2_ldflags="-lv4l2"
- - LIBS="$LIBS -lv4l2"
- + PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT -lv4l2"
- + PJMEDIA_VIDEODEV_EXT="$PJMEDIA_VIDEODEV_EXT -lv4l2"
- + PJNATH_EXT="$PJNATH_EXT -lv4l2"
-
-
- fi
- @@ -7878,6 +7891,7 @@ fi
- $as_echo "$ac_cv_lib_opencore_amrnb_Encoder_Interface_init" >&6; }
- if test "x$ac_cv_lib_opencore_amrnb_Encoder_Interface_init" = xyes; then :
- opencore_amrnb_present=1 && LIBS="$LIBS -lopencore-amrnb"
- + opencore_amrnb_present=1 && PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT -lopencore-amrnb" && PJNATH_EXT="$PJNATH_EXT -lopencore-amrnb"
- fi
-
- if test "x$opencore_amrnb_h_present" = "x1" -a "x$opencore_amrnb_present" = "x1"; then
- @@ -7943,7 +7957,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opencore_amrwb_D_IF_init" >&5
- $as_echo "$ac_cv_lib_opencore_amrwb_D_IF_init" >&6; }
- if test "x$ac_cv_lib_opencore_amrwb_D_IF_init" = xyes; then :
- - opencore_amrwb_dec_present=1 && LIBS="$LIBS -lopencore-amrwb"
- + opencore_amrwb_dec_present=1 && PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT -lopencore-amrnb" && PJNATH_EXT="$PJNATH_EXT -lopencore-amrwb"
- fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for E_IF_init in -lvo-amrwbenc" >&5
+diff --git a/aconfigure.ac b/aconfigure.ac
+index 72446dd..db287a1 100644
+--- a/aconfigure.ac
++++ b/aconfigure.ac
+@@ -115,6 +115,11 @@ AC_CHECK_LIB(socket,puts)
+ AC_CHECK_LIB(rt,puts)
+ AC_CHECK_LIB(m,sin)
+ AC_SUBST(PJLIB_EXT)
++AC_SUBST(PJLIB_UTIL_EXT)
++AC_SUBST(PJMEDIA_EXT)
++AC_SUBST(PJMEDIA_CODEC_EXT)
++AC_SUBST(PJMEDIA_VIDEODEV_EXT)
++AC_SUBST(PJNATH_EXT)
+ AC_CHECK_LIB(uuid,uuid_generate,[PJLIB_EXT="-luuid $PJLIB_EXT"])
+ AC_CHECK_LIB(uuid,uuid_generate,[ac_has_uuid_lib=1])
+ AC_SEARCH_LIBS(gethostbyname,nsl)
+@@ -951,7 +956,9 @@ AC_ARG_ENABLE(sdl,
+ ac_sdl_cflags=`$SDL_CONFIG --cflags`
+ ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags"
+ ac_sdl_ldflags=`$SDL_CONFIG --libs`
+- LIBS="$LIBS $ac_sdl_ldflags"
++ PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT $ac_sdl_ldflags"
++ PJMEDIA_VIDEODEV_EXT="$PJMEDIA_VIDEODEV_EXT $ac_sdl_ldflags"
++ PJNATH_EXT="$PJNATH_EXT $ac_sdl_ldflags"
+ else
+ AC_MSG_RESULT([Unsupported SDL version])
+ fi
+@@ -1088,7 +1095,11 @@ AC_ARG_ENABLE(ffmpeg,
+
+ fi
+
+- LIBS="$LIBS $ac_ffmpeg_ldflags"
++ PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT $ac_ffmpeg_ldflags"
++ PJMEDIA_EXT="$PJMEDIA_EXT $ac_ffmpeg_ldflags"
++ PJMEDIA_CODEC_EXT="$PJMEDIA_CODEC_EXT $ac_ffmpeg_ldflags"
++ # FIXME: only needs libavutil
++ PJNATH_EXT="$PJNATH_EXT $ac_ffmpeg_ldflags"
+ export PKG_CONFIG_PATH=$SAVED_PKG_CONFIG_PATH
+ ]
+ )
+@@ -1109,7 +1120,10 @@ AC_ARG_ENABLE(v4l2,
+ v4l2_open,
+ [ac_v4l2_cflags="-DPJMEDIA_VIDEO_DEV_HAS_V4L2=1"
+ ac_v4l2_ldflags="-lv4l2"
+- LIBS="$LIBS -lv4l2"
++ PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT -lv4l2"
++ PJMEDIA_VIDEODEV_EXT="$PJMEDIA_VIDEODEV_EXT -lv4l2"
++ PJNATH_EXT="$PJNATH_EXT -lv4l2"
++
+ ]
+ )
+ ])
+@@ -1611,7 +1625,7 @@ AC_ARG_ENABLE(opencore_amr,
+ AC_SUBST(opencore_amrnb_h_present)
+ AC_SUBST(opencore_amrnb_present)
+ AC_CHECK_HEADER(opencore-amrnb/interf_enc.h,[opencore_amrnb_h_present=1])
+- AC_CHECK_LIB(opencore-amrnb,Encoder_Interface_init,[opencore_amrnb_present=1 && LIBS="$LIBS -lopencore-amrnb"])
++ AC_CHECK_LIB(opencore-amrnb,Encoder_Interface_init,[opencore_amrnb_present=1 && PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT -lopencore-amrnb" && PJNATH_EXT="$PJNATH_EXT -lopencore-amrnb" ])
+ if test "x$opencore_amrnb_h_present" = "x1" -a "x$opencore_amrnb_present" = "x1"; then
+ AC_MSG_RESULT([OpenCORE AMR-NB library found, AMR-NB support enabled])
+ AC_DEFINE(PJMEDIA_HAS_OPENCORE_AMRNB_CODEC,1)
+@@ -1625,7 +1639,7 @@ AC_ARG_ENABLE(opencore_amr,
+ AC_SUBST(opencore_amrwb_dec_present)
+ AC_CHECK_HEADER(vo-amrwbenc/enc_if.h,[opencore_amrwb_enc_h_present=1])
+ AC_CHECK_HEADER(opencore-amrwb/dec_if.h,[opencore_amrwb_dec_h_present=1])
+- AC_CHECK_LIB(opencore-amrwb,D_IF_init,[opencore_amrwb_dec_present=1 && LIBS="$LIBS -lopencore-amrwb"])
++ AC_CHECK_LIB(opencore-amrwb,D_IF_init,[opencore_amrwb_dec_present=1 && PJLIB_UTIL_EXT="$PJLIB_UTIL_EXT -lopencore-amrnb" && PJNATH_EXT="$PJNATH_EXT -lopencore-amrwb" ])
+ AC_CHECK_LIB(vo-amrwbenc,E_IF_init,[opencore_amrwb_enc_present=1 && LIBS="$LIBS -lvo-amrwbenc"])
+ if test "x$opencore_amrwb_enc_h_present" = "x1" -a "x$opencore_amrwb_dec_h_present" = "x1" -a "x$opencore_amrwb_enc_present" = "x1" -a "x$opencore_amrwb_dec_present" = "x1"; then
+ AC_MSG_RESULT([OpenCORE AMR-WB library found, AMR-WB support enabled])
+diff --git a/build.mak.in b/build.mak.in
+index 5c4fc40..4555ae9 100644
+--- a/build.mak.in
++++ b/build.mak.in
+@@ -29,6 +29,11 @@ export APP_THIRD_PARTY_LIBS :=
+ export APP_THIRD_PARTY_LIB_FILES :=
+
+ PJLIB_EXT = @PJLIB_EXT@
++PJLIB_UTIL_EXT = @PJLIB_UTIL_EXT@
++PJMEDIA_EXT = @PJMEDIA_EXT@
++PJMEDIA_CODEC_EXT = @PJMEDIA_CODEC_EXT@
++PJMEDIA_VIDEODEV_EXT = @PJMEDIA_VIDEODEV_EXT@
++PJNATH_EXT = @PJNATH_EXT@
+
+ ifeq (@ac_external_srtp@,1)
+ # External SRTP library
+diff --git a/pjlib-util/build/Makefile b/pjlib-util/build/Makefile
+index a03a558..56bc055 100644
+--- a/pjlib-util/build/Makefile
++++ b/pjlib-util/build/Makefile
+@@ -43,7 +43,7 @@ export PJLIB_UTIL_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
+ stun_simple_client.o xml.o
+ export PJLIB_UTIL_CFLAGS += $(_CFLAGS)
+ export PJLIB_UTIL_CXXFLAGS += $(_CXXFLAGS)
+-export PJLIB_UTIL_LDFLAGS += $(PJLIB_LDLIB) $(_LDFLAGS)
++export PJLIB_UTIL_LDFLAGS += $(PJLIB_LDLIB) $(PJLIB_UTIL_EXT) $(_LDFLAGS)
+
+ ###############################################################################
+ # Defines for building test application
+diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
+index 340bfc4..83d852a 100644
+--- a/pjmedia/build/Makefile
++++ b/pjmedia/build/Makefile
+@@ -85,6 +85,7 @@ export PJMEDIA_LDFLAGS += $(PJMEDIA_VIDEODEV_LDLIB) \
+ $(PJLIB_UTIL_LDLIB) \
+ $(PJNATH_LDLIB) \
+ $(PJMEDIA_EXT) \
++ $(PJMEDIA_VIDEODEV_EXT) \
+ $(_LDFLAGS)
+
+
+diff --git a/pjnath/build/Makefile b/pjnath/build/Makefile
+index 5f08a8a..8fb976d 100644
+--- a/pjnath/build/Makefile
++++ b/pjnath/build/Makefile
+@@ -43,7 +43,8 @@ export PJNATH_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
+ stun_transaction.o turn_session.o turn_sock.o
+ export PJNATH_CFLAGS += $(_CFLAGS)
+ export PJNATH_CXXFLAGS += $(_CXXFLAGS)
+-export PJNATH_LDFLAGS += $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(_LDFLAGS)
++export PJNATH_LDFLAGS += $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(PJNATH_EXT) \
++ $(_LDFLAGS)
+
+ ###############################################################################
+ # Defines for building test application
diff --cc debian/patches/0008-Replace-deprecated-FFmpeg-API.patch
index 04eb153,0000000..7b26d4b
mode 100644,000000..100644
--- a/debian/patches/0008-Replace-deprecated-FFmpeg-API.patch
+++ b/debian/patches/0008-Replace-deprecated-FFmpeg-API.patch
@@@ -1,212 -1,0 +1,212 @@@
- From 6dc6353dfc8009504c17367d9e6a14dba12d2d02 Mon Sep 17 00:00:00 2001
++From 9710e1e5a02bc36e5f44a1102d06d006b43c4f72 Mon Sep 17 00:00:00 2001
+From: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
+Date: Thu, 5 Nov 2015 05:01:32 +0200
+Subject: Replace deprecated FFmpeg API
+
+---
+ pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c | 10 ++---
+ pjmedia/src/pjmedia-videodev/ffmpeg_dev.c | 2 +-
+ pjmedia/src/pjmedia/converter_libswscale.c | 2 +-
+ pjmedia/src/pjmedia/ffmpeg_util.c | 54 +++++++++++++--------------
+ pjmedia/src/pjmedia/ffmpeg_util.h | 4 +-
+ 5 files changed, 36 insertions(+), 36 deletions(-)
+
+diff --git a/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c b/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c
+index 812a9d7..8ae1a98 100644
+--- a/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c
++++ b/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c
+@@ -194,7 +194,7 @@ typedef struct ffmpeg_private
+ /* The ffmpeg decoder cannot set the output format, so format conversion
+ * may be needed for post-decoding.
+ */
+- enum PixelFormat expected_dec_fmt;
++ enum AVPixelFormat expected_dec_fmt;
+ /**< Expected output format of
+ ffmpeg decoder */
+
+@@ -673,7 +673,7 @@ PJ_DEF(pj_status_t) pjmedia_codec_ffmpeg_vid_init(pjmedia_vid_codec_mgr *mgr,
+ pjmedia_format_id raw_fmt[PJMEDIA_VID_CODEC_MAX_DEC_FMT_CNT];
+ unsigned raw_fmt_cnt = 0;
+ unsigned raw_fmt_cnt_should_be = 0;
+- const enum PixelFormat *p = c->pix_fmts;
++ const enum AVPixelFormat *p = c->pix_fmts;
+
+ for(;(p && *p != -1) &&
+ (raw_fmt_cnt < PJMEDIA_VID_CODEC_MAX_DEC_FMT_CNT);
+@@ -1096,7 +1096,7 @@ static void print_ffmpeg_err(int err)
+ static pj_status_t open_ffmpeg_codec(ffmpeg_private *ff,
+ pj_mutex_t *ff_mutex)
+ {
+- enum PixelFormat pix_fmt;
++ enum AVPixelFormat pix_fmt;
+ pjmedia_video_format_detail *vfd;
+ pj_bool_t enc_opened = PJ_FALSE, dec_opened = PJ_FALSE;
+ pj_status_t status;
+@@ -1429,7 +1429,7 @@ static pj_status_t ffmpeg_codec_encode_whole(pjmedia_vid_codec *codec,
+ /* Check if encoder has been opened */
+ PJ_ASSERT_RETURN(ff->enc_ctx, PJ_EINVALIDOP);
+
+- avcodec_get_frame_defaults(&avframe);
++ av_frame_unref(&avframe);
+
+ // Let ffmpeg manage the timestamps
+ /*
+@@ -1679,7 +1679,7 @@ static pj_status_t ffmpeg_codec_decode_whole(pjmedia_vid_codec *codec,
+ * whole decoding session, and seems to be freed when the codec context
+ * closed).
+ */
+- avcodec_get_frame_defaults(&avframe);
++ av_frame_unref(&avframe);
+
+ /* Init packet, the container of the encoded data */
+ av_init_packet(&avpacket);
+diff --git a/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c b/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c
+index 849b760..4a83f65 100644
+--- a/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c
++++ b/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c
+@@ -176,7 +176,7 @@ static pj_status_t ffmpeg_capture_open(AVFormatContext **ctx,
+ fp.prealloced_context = 1;
+ fp.width = vfd->size.w;
+ fp.height = vfd->size.h;
+- fp.pix_fmt = PIX_FMT_BGR24;
++ fp.pix_fmt = AV_PIX_FMT_BGR24;
+ fp.time_base.num = vfd->fps.denum;
+ fp.time_base.den = vfd->fps.num;
+
+diff --git a/pjmedia/src/pjmedia/converter_libswscale.c b/pjmedia/src/pjmedia/converter_libswscale.c
+index 3bb1c6a..86fa766 100644
+--- a/pjmedia/src/pjmedia/converter_libswscale.c
++++ b/pjmedia/src/pjmedia/converter_libswscale.c
+@@ -66,7 +66,7 @@ static pj_status_t factory_create_converter(pjmedia_converter_factory *cf,
+ const pjmedia_conversion_param *prm,
+ pjmedia_converter **p_cv)
+ {
+- enum PixelFormat srcFormat, dstFormat;
++ enum AVPixelFormat srcFormat, dstFormat;
+ const pjmedia_video_format_detail *src_detail, *dst_detail;
+ const pjmedia_video_format_info *src_fmt_info, *dst_fmt_info;
+ struct SwsContext *sws_ctx;
+diff --git a/pjmedia/src/pjmedia/ffmpeg_util.c b/pjmedia/src/pjmedia/ffmpeg_util.c
+index 300bad3..a38609b 100644
+--- a/pjmedia/src/pjmedia/ffmpeg_util.c
++++ b/pjmedia/src/pjmedia/ffmpeg_util.c
+@@ -26,39 +26,39 @@
+ #include "ffmpeg_util.h"
+ #include <libavformat/avformat.h>
+
+-/* PIX_FMT_GBR24P hassle:
+- * - PIX_FMT_GBR24P is introduced (perhaps in avutil 51.20.1)
+- * - suddenly PIX_FMT_GBR24P is replaced by PIX_FMT_GBRP, no alias defined,
+- * so PIX_FMT_GBR24P is just gone! (perhaps in avutil 51.42.0)
+- * - then lately PIX_FMT_GBR24P is defined as PIX_FMT_GBRP
++/* AV_PIX_FMT_GBR24P hassle:
++ * - AV_PIX_FMT_GBR24P is introduced (perhaps in avutil 51.20.1)
++ * - suddenly AV_PIX_FMT_GBR24P is replaced by AV_PIX_FMT_GBRP, no alias defined,
++ * so AV_PIX_FMT_GBR24P is just gone! (perhaps in avutil 51.42.0)
++ * - then lately AV_PIX_FMT_GBR24P is defined as AV_PIX_FMT_GBRP
+ */
+-#if !defined(PIX_FMT_GBR24P) && \
++#if !defined(AV_PIX_FMT_GBR24P) && \
+ LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,42,0)
+-# define PIX_FMT_GBR24P PIX_FMT_GBRP
++# define AV_PIX_FMT_GBR24P AV_PIX_FMT_GBRP
+ #endif
+
+-/* Conversion table between pjmedia_format_id and PixelFormat */
++/* Conversion table between pjmedia_format_id and AVPixelFormat */
+ static const struct ffmpeg_fmt_table_t
+ {
+ pjmedia_format_id id;
+- enum PixelFormat pf;
++ enum AVPixelFormat pf;
+ } ffmpeg_fmt_table[] =
+ {
+- { PJMEDIA_FORMAT_RGBA, PIX_FMT_RGBA},
+- { PJMEDIA_FORMAT_RGB24,PIX_FMT_BGR24},
+- { PJMEDIA_FORMAT_BGRA, PIX_FMT_BGRA},
++ { PJMEDIA_FORMAT_RGBA, AV_PIX_FMT_RGBA},
++ { PJMEDIA_FORMAT_RGB24,AV_PIX_FMT_BGR24},
++ { PJMEDIA_FORMAT_BGRA, AV_PIX_FMT_BGRA},
+ #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 20, 1)
+- { PJMEDIA_FORMAT_GBRP, PIX_FMT_GBR24P},
++ { PJMEDIA_FORMAT_GBRP, AV_PIX_FMT_GBR24P},
+ #endif
+
+- { PJMEDIA_FORMAT_AYUV, PIX_FMT_NONE},
+- { PJMEDIA_FORMAT_YUY2, PIX_FMT_YUYV422},
+- { PJMEDIA_FORMAT_UYVY, PIX_FMT_UYVY422},
+- { PJMEDIA_FORMAT_I420, PIX_FMT_YUV420P},
+- //{ PJMEDIA_FORMAT_YV12, PIX_FMT_YUV420P},
+- { PJMEDIA_FORMAT_I422, PIX_FMT_YUV422P},
+- { PJMEDIA_FORMAT_I420JPEG, PIX_FMT_YUVJ420P},
+- { PJMEDIA_FORMAT_I422JPEG, PIX_FMT_YUVJ422P},
++ { PJMEDIA_FORMAT_AYUV, AV_PIX_FMT_NONE},
++ { PJMEDIA_FORMAT_YUY2, AV_PIX_FMT_YUYV422},
++ { PJMEDIA_FORMAT_UYVY, AV_PIX_FMT_UYVY422},
++ { PJMEDIA_FORMAT_I420, AV_PIX_FMT_YUV420P},
++ //{ PJMEDIA_FORMAT_YV12, AV_PIX_FMT_YUV420P},
++ { PJMEDIA_FORMAT_I422, AV_PIX_FMT_YUV422P},
++ { PJMEDIA_FORMAT_I420JPEG, AV_PIX_FMT_YUVJ420P},
++ { PJMEDIA_FORMAT_I422JPEG, AV_PIX_FMT_YUVJ422P},
+ };
+
+ /* Conversion table between pjmedia_format_id and CodecID */
+@@ -139,22 +139,22 @@ static void ffmpeg_log_cb(void* ptr, int level, const char* fmt, va_list vl)
+
+
+ pj_status_t pjmedia_format_id_to_PixelFormat(pjmedia_format_id fmt_id,
+- enum PixelFormat *pixel_format)
++ enum AVPixelFormat *pixel_format)
+ {
+ unsigned i;
+ for (i=0; i<PJ_ARRAY_SIZE(ffmpeg_fmt_table); ++i) {
+ const struct ffmpeg_fmt_table_t *t = &ffmpeg_fmt_table[i];
+- if (t->id==fmt_id && t->pf != PIX_FMT_NONE) {
++ if (t->id==fmt_id && t->pf != AV_PIX_FMT_NONE) {
+ *pixel_format = t->pf;
+ return PJ_SUCCESS;
+ }
+ }
+
+- *pixel_format = PIX_FMT_NONE;
++ *pixel_format = AV_PIX_FMT_NONE;
+ return PJ_ENOTFOUND;
+ }
+
+-pj_status_t PixelFormat_to_pjmedia_format_id(enum PixelFormat pf,
++pj_status_t PixelFormat_to_pjmedia_format_id(enum AVPixelFormat pf,
+ pjmedia_format_id *fmt_id)
+ {
+ unsigned i;
+@@ -175,13 +175,13 @@ pj_status_t pjmedia_format_id_to_CodecID(pjmedia_format_id fmt_id,
+ unsigned i;
+ for (i=0; i<PJ_ARRAY_SIZE(ffmpeg_codec_table); ++i) {
+ const struct ffmpeg_codec_table_t *t = &ffmpeg_codec_table[i];
+- if (t->id==fmt_id && t->codec_id != PIX_FMT_NONE) {
++ if (t->id==fmt_id && t->codec_id != AV_PIX_FMT_NONE) {
+ *codec_id = t->codec_id;
+ return PJ_SUCCESS;
+ }
+ }
+
+- *codec_id = (unsigned)PIX_FMT_NONE;
++ *codec_id = (unsigned)AV_PIX_FMT_NONE;
+ return PJ_ENOTFOUND;
+ }
+
+diff --git a/pjmedia/src/pjmedia/ffmpeg_util.h b/pjmedia/src/pjmedia/ffmpeg_util.h
+index 558347d..0b6f9c9 100644
+--- a/pjmedia/src/pjmedia/ffmpeg_util.h
++++ b/pjmedia/src/pjmedia/ffmpeg_util.h
+@@ -41,9 +41,9 @@ void pjmedia_ffmpeg_add_ref();
+ void pjmedia_ffmpeg_dec_ref();
+
+ pj_status_t pjmedia_format_id_to_PixelFormat(pjmedia_format_id fmt_id,
+- enum PixelFormat *pixel_format);
++ enum AVPixelFormat *pixel_format);
+
+-pj_status_t PixelFormat_to_pjmedia_format_id(enum PixelFormat pf,
++pj_status_t PixelFormat_to_pjmedia_format_id(enum AVPixelFormat pf,
+ pjmedia_format_id *fmt_id);
+
+ pj_status_t pjmedia_format_id_to_CodecID(pjmedia_format_id fmt_id,
diff --cc debian/patches/0009-add-v5-suffix-to-soname-of-libpjsua2-2.patch
index 914e596,0000000..0221ea7
mode 100644,000000..100644
--- a/debian/patches/0009-add-v5-suffix-to-soname-of-libpjsua2-2.patch
+++ b/debian/patches/0009-add-v5-suffix-to-soname-of-libpjsua2-2.patch
@@@ -1,40 -1,0 +1,40 @@@
- From c9d40b9830767ef21a09eaa15272f9ca0ce08bfc Mon Sep 17 00:00:00 2001
++From 24cd21cda01347fb146bbc7c41bdbdc89db85439 Mon Sep 17 00:00:00 2001
+From: Tzafrir Cohen <tzafrir at debian.org>
+Date: Thu, 5 Nov 2015 04:55:06 +0200
+Subject: add 'v5' suffix to soname of libpjsua2-2
+
+pjsua2 is a C++ library and its SONAME needs to be bumped as its ABI has
+changed with GCC 5 (using C++11 ABI).
+
+Remove this patch once the ABI for all libraries has been bumped.
+---
+ build.mak.in | 2 +-
+ pjsip/build/Makefile | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build.mak.in b/build.mak.in
+index 4555ae9..93d3ff7 100644
+--- a/build.mak.in
++++ b/build.mak.in
+@@ -252,7 +252,7 @@ export ADD_LIB_FILES := $(PJ_DIR)/pjsip/lib/libpjsua.$(SHLIB_SUFFIX).$(PJ_VERSIO
+
+ APP_LIB_FILES += $(ADD_LIB_FILES)
+
+-APP_LIBXX_FILES += $(PJ_DIR)/pjsip/lib/libpjsua2.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjsip/lib/libpjsua2.$(SHLIB_SUFFIX) \
++APP_LIBXX_FILES += $(PJ_DIR)/pjsip/lib/libpjsua2.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR)v5 $(PJ_DIR)/pjsip/lib/libpjsua2.$(SHLIB_SUFFIX) \
+ $(ADD_LIB_FILES)
+ endif
+
+diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile
+index a9bd5ad..eef4176 100644
+--- a/pjsip/build/Makefile
++++ b/pjsip/build/Makefile
+@@ -34,7 +34,7 @@ export PJSIP_SIMPLE_SHLIB := $(PJSIP_SIMPLE_SONAME).$(PJ_VERSION_MAJOR)
+ export PJSUA_LIB_SONAME := libpjsua.$(SHLIB_SUFFIX)
+ export PJSUA_LIB_SHLIB := $(PJSUA_LIB_SONAME).$(PJ_VERSION_MAJOR)
+ export PJSUA2_LIB_SONAME := libpjsua2.$(SHLIB_SUFFIX)
+-export PJSUA2_LIB_SHLIB := $(PJSUA2_LIB_SONAME).$(PJ_VERSION_MAJOR)
++export PJSUA2_LIB_SHLIB := $(PJSUA2_LIB_SONAME).$(PJ_VERSION_MAJOR)v5
+ endif
+
+ ###############################################################################
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/pjproject.git
More information about the Pkg-voip-commits
mailing list