[SCM] faac packaging branch, master, updated. debian/1.28-0fab2-11-g5313b4b

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Mon Apr 26 03:34:34 UTC 2010


The following commit has been merged in the master branch:
commit 7e0998d38d4a7c15bf6b02491d5605eabd0bfedb
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Apr 25 23:20:01 2010 -0400

    Fix check with strcmp, checking for return value of 0 for equality.

diff --git a/debian/patches/build-fix.patch b/debian/patches/build-fix.patch
index 9f9d2c9..2aa28ab 100644
--- a/debian/patches/build-fix.patch
+++ b/debian/patches/build-fix.patch
@@ -136,12 +136,12 @@ strings.
  		if (!strcmp(normType, m_pTracks[i]->GetType())) {
  			if (subType) {
 -				if (normType == MP4_AUDIO_TRACK_TYPE) {
-+				if (strcmp(normType,MP4_AUDIO_TRACK_TYPE)) {
++				if (!strcmp(normType,MP4_AUDIO_TRACK_TYPE)) {
  					if (subType != GetTrackEsdsObjectTypeId(m_pTracks[i]->GetId())) {
  						continue;
  					}
 -				} else if (normType == MP4_VIDEO_TRACK_TYPE) {
-+				} else if (strcmp(normType,MP4_VIDEO_TRACK_TYPE)) {
++				} else if (!strcmp(normType,MP4_VIDEO_TRACK_TYPE)) {
  					if (subType != GetTrackEsdsObjectTypeId(m_pTracks[i]->GetId())) {
  						continue;
  					}
@@ -150,12 +150,12 @@ strings.
      if (!strcmp(normType, m_pTracks[i]->GetType())) {
        if (subType) {
 -	if (normType == MP4_AUDIO_TRACK_TYPE) {
-+	if (strcmp(normType,MP4_AUDIO_TRACK_TYPE)) {
++	if (!strcmp(normType,MP4_AUDIO_TRACK_TYPE)) {
  	  if (subType != GetTrackEsdsObjectTypeId(m_pTracks[i]->GetId())) {
  	    continue;
  	  }
 -	} else if (normType == MP4_VIDEO_TRACK_TYPE) {
-+	} else if (strcmp(normType,MP4_VIDEO_TRACK_TYPE)) {
++	} else if (!strcmp(normType,MP4_VIDEO_TRACK_TYPE)) {
  	  if (subType != GetTrackEsdsObjectTypeId(m_pTracks[i]->GetId())) {
  	    continue;
  	  }

-- 
faac packaging



More information about the pkg-multimedia-commits mailing list