[Pkg-voip-commits] [pjproject] 13/42: merge patched into master

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch master-2.3
in repository pjproject.

commit 5fbed6299b7ef6ff7dc922f8dbb02ec0f5af50a0
Merge: 35684ff ca970e9
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Thu Oct 30 09:24:38 2014 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../0005-CODEC_ID_-changed-to-AV_CODEC_ID_.patch   | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 pjmedia/src/pjmedia/ffmpeg_util.c                  | 16 +++++-----
 4 files changed, 47 insertions(+), 10 deletions(-)

diff --cc debian/.git-dpm
index aebd0c0,0000000..7713f9d
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
- d0bad6effb8f5b14eafe410a18077c9fc292582f
- d0bad6effb8f5b14eafe410a18077c9fc292582f
++ca970e9849cd932fea5c3b27609b0dfba7d2c628
++ca970e9849cd932fea5c3b27609b0dfba7d2c628
 +0f2fb3560bfd7eccacf6e240a6a344e1dc266b2f
 +0f2fb3560bfd7eccacf6e240a6a344e1dc266b2f
 +pjproject_2.3~dfsg.orig.tar.bz2
 +5f73a3784e4d6c2e7300f583bab27bad3ec1ae48
 +4402101
diff --cc debian/patches/0005-CODEC_ID_-changed-to-AV_CODEC_ID_.patch
index 0000000,0000000..e75d881
new file mode 100644
--- /dev/null
+++ b/debian/patches/0005-CODEC_ID_-changed-to-AV_CODEC_ID_.patch
@@@ -1,0 -1,0 +1,36 @@@
++From ca970e9849cd932fea5c3b27609b0dfba7d2c628 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/series
index 2d05947,0000000..9f00882
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,5 @@@
 +0001-Remove-pointless-linking-with-libasound.patch
 +0002-Reduce-number-of-libraries-linked-with-pjlib.patch
 +0003-Reduce-number-of-libraries-linked-with-pjmedia.patch
 +0004-Enable-building-python-bindings.patch
++0005-CODEC_ID_-changed-to-AV_CODEC_ID_.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/pjproject.git