← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to debian/patches/pj_project_status.patch

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2015-01-07 14:51:16 UTC
  • mfrom: (4.3.5 sid)
  • Revision ID: package-import@ubuntu.com-20150107145116-yxnafinf4lrdvrmx
Tags: 1.4.1-0.1ubuntu1
* Merge with Debian, remaining changes:
 - Drop soprano, nepomuk build-dep
* Drop ubuntu patches, now upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/pj_project_status.patch
 
1
diff --git a/daemon/libs/pjproject-2.2.1/pjmedia/src/pjmedia-codec/audio_codecs.c b/daemon/libs/pjproject-2.2.1/pjmedia/src/pjmedia-codec/audio_codecs.c
 
2
index 66ae236..36d8bb4 100644
 
3
--- a/daemon/libs/pjproject-2.2.1/pjmedia/src/pjmedia-codec/audio_codecs.c
 
4
+++ b/daemon/libs/pjproject-2.2.1/pjmedia/src/pjmedia-codec/audio_codecs.c
 
5
@@ -33,9 +33,9 @@ PJ_DEF(pj_status_t)
 
6
 pjmedia_codec_register_audio_codecs(pjmedia_endpt *endpt,
 
7
                                     const pjmedia_audio_codec_config *c)
 
8
 {
 
9
+    pj_status_t status;
 
10
     pjmedia_audio_codec_config default_cfg;
 
11
 #if PJMEDIA_HAS_PASSTHROUGH_CODECS
 
12
-    pj_status_t status;
 
13
 #endif
 
14
 
 
15
     PJ_ASSERT_RETURN(endpt, PJ_EINVAL);