[SCM] morituri/master: * morituri/common/encode.py: Alac does not have merge_tags. Fixes #15.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0b520f2e86fedfd450390c67b34def016c6a2771
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Thu May 19 01:23:53 2011 +0000

    	* morituri/common/encode.py:
    	  Alac does not have merge_tags.  Fixes #15.

diff --git a/ChangeLog b/ChangeLog
index 3f66529..eca5bc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-05-19  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* morituri/common/encode.py:
+	  Alac does not have merge_tags.  Fixes #15.
+
+2011-05-19  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* morituri/program/cdparanoia.py:
 	* morituri/common/encode.py:
 	* morituri/common/program.py:
diff --git a/morituri/common/encode.py b/morituri/common/encode.py
index a3d64a7..0d27c21 100644
--- a/morituri/common/encode.py
+++ b/morituri/common/encode.py
@@ -66,10 +66,11 @@ class FlacProfile(Profile):
 
         return True
 
+# FIXME: ffenc_alac does not have merge_tags
 class AlacProfile(Profile):
     name = 'alac'
     extension = 'alac'
-    pipeline = 'ffenc_alac name=tagger'
+    pipeline = 'ffenc_alac'
     lossless = True
 
 # FIXME: wavenc does not have merge_tags

-- 
morituri packaging