[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] mp4/audio/renderer dllumakefil, 1.7.110.1, 1.7.110.2 libumakefil, 1.16.10.1, 1.16.10.
From:       yuxinliu () helixcommunity ! org
Date:       2013-04-27 2:46:15
[Download RAW message or body]

Update of /cvsroot/datatype/mp4/audio/renderer
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv11417

Modified Files:
      Tag: PRODUCER_14_0_RN
	dllumakefil libumakefil mp4afmt.cpp 
Log Message:
Don't remove amr

Index: libumakefil
===================================================================
RCS file: /cvsroot/datatype/mp4/audio/renderer/libumakefil,v
retrieving revision 1.16.10.1
retrieving revision 1.16.10.2
diff -u -d -r1.16.10.1 -r1.16.10.2
--- libumakefil	18 Apr 2013 08:30:47 -0000	1.16.10.1
+++ libumakefil	27 Apr 2013 02:46:07 -0000	1.16.10.2
@@ -58,7 +58,8 @@
                           "datatype/include",
                           "datatype/rm/include",
                           "datatype/rm/common/pub",
-                          "datatype/mp4/payload/pub",                          
+                          "datatype/mp4/payload/pub",
+                          "datatype/amr/common/pub",
                           "datatype/mp4/common/pub",
                           "datatype/mdf/audio/common/pub")
 

Index: dllumakefil
===================================================================
RCS file: /cvsroot/datatype/mp4/audio/renderer/dllumakefil,v
retrieving revision 1.7.110.1
retrieving revision 1.7.110.2
diff -u -d -r1.7.110.1 -r1.7.110.2
--- dllumakefil	18 Apr 2013 08:30:47 -0000	1.7.110.1
+++ dllumakefil	27 Apr 2013 02:46:07 -0000	1.7.110.2
@@ -57,7 +57,8 @@
                            "datatype/common/util[dtutillib]",
                            "datatype/common/audrend",
                            "datatype/mp4/common[mp4comlib]",
-                           "datatype/mp4/payload[mp4pyldlib]",                          
+                           "datatype/mp4/payload[mp4pyldlib]",
+                           "datatype/amr/common[amrcomlib]",
                            "datatype/mp4/audio/renderer[mp4arenderlib]")
 
 project.AddSources("audiids.cpp")

Index: mp4afmt.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/audio/renderer/mp4afmt.cpp,v
retrieving revision 1.37.2.1
retrieving revision 1.37.2.2
diff -u -d -r1.37.2.1 -r1.37.2.2
--- mp4afmt.cpp	18 Apr 2013 08:30:47 -0000	1.37.2.1
+++ mp4afmt.cpp	27 Apr 2013 02:46:07 -0000	1.37.2.2
@@ -58,16 +58,11 @@
 #include "mp4audio.h"
 #include "mp4apyld.h"
 #include "mp4gpyld.h"
-
+#include "amrpyld.h"
 #include "qclppyld.h"
 #include "evrcpyld.h"
-
-#include "pckunpck.h"
-
-#if defined(HELIX_FEATURE_AUDIO_CODEC_AMRNB) || defined(HELIX_FEATURE_AUDIO_CODEC_AMRWB)
-#include "amrpyld.h"
 #include "hxamrpyld.h"
-#endif
+#include "pckunpck.h"
 
 #if defined(HELIX_FEATURE_AUDIO_CODEC_MP3)
 #include "mp3draft.h"


_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs
[prev in list] [next in list] [prev in thread] [next in thread]