[SCM] MediaTomb packaging branch, master, updated. debian/0.12.0.svn2018-4-13-g788c170

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5c3530da8ee73df970cae972838ff3c4ca11beab
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon Feb 8 13:03:49 2010 -0500

    Update config.xml example configuration.

diff --git a/debian/changelog b/debian/changelog
index e666f08..9a29a2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,9 @@ mediatomb (0.12.0~svn2018-6) UNRELEASED; urgency=low
   * Confirmed that mediatomb is unaffected by new magic_load() function change.
     (Closes: #501586)
   * Add description to const_char_conversion.patch.
+  * Update config.xml example configuration.
 
- -- Andres Mejia <mcitadel at gmail.com>  Sun, 07 Feb 2010 23:19:32 -0500
+ -- Andres Mejia <mcitadel at gmail.com>  Mon, 08 Feb 2010 13:03:02 -0500
 
 mediatomb (0.12.0~svn2018-5) unstable; urgency=medium
 
diff --git a/debian/examples/config.xml b/debian/examples/config.xml
index 7b328b9..7e5ec55 100644
--- a/debian/examples/config.xml
+++ b/debian/examples/config.xml
@@ -24,7 +24,7 @@
         <database>mediatomb</database>
       </mysql>
     </storage>
-    <protocolInfo extend="yes"/><!-- For PS3 support change to "yes" -->
+    <protocolInfo extend="no"/><!-- For PS3 support change to "yes" -->
     <!--
        Uncomment the lines below to get rid of jerky avi playback on the
        DSM320 or to enable subtitles support on the DSM units
@@ -42,7 +42,7 @@
        <upnp-string-limit>101</upnp-string-limit>
     -->
     <extended-runtime-options>
-      <ffmpegthumbnailer enabled="yes">
+      <ffmpegthumbnailer enabled="no">
         <thumbnail-size>128</thumbnail-size>
         <seek-percentage>5</seek-percentage>
         <filmstrip-overlay>yes</filmstrip-overlay>
@@ -80,7 +80,7 @@
         <map from="mkv" to="video/x-matroska"/>
         <map from="mka" to="audio/x-matroska"/>
         <!-- Uncomment the line below for PS3 divx support -->
-        <map from="avi" to="video/divx"/>
+        <!-- <map from="avi" to="video/divx"/> -->
         <!-- Uncomment the line below for D-Link DSM / ZyXEL DMA-1000 -->
         <!-- <map from="avi" to="video/avi"/> -->
       </extension-mimetype>
@@ -88,6 +88,7 @@
         <map from="audio/*" to="object.item.audioItem.musicTrack"/>
         <map from="video/*" to="object.item.videoItem"/>
         <map from="image/*" to="object.item.imageItem"/>
+        <map from="application/ogg" to="object.item.audioItem.musicTrack"/>
       </mimetype-upnpclass>
       <mimetype-contenttype>
         <treat mimetype="audio/mpeg" as="mp3"/>
@@ -103,6 +104,8 @@
         <treat mimetype="audio/mp4" as="mp4"/>
         <treat mimetype="application/x-iso9660" as="dvd"/>
         <treat mimetype="application/x-iso9660-image" as="dvd"/>
+        <treat mimetype="video/x-matroska" as="mkv"/>
+        <treat mimetype="audio/x-matroska" as="mka"/>
       </mimetype-contenttype>
     </mappings>
     <online-content>

-- 
MediaTomb packaging