diff -Nru mediatomb-0.12.1/debian/changelog mediatomb-0.12.1/debian/changelog
--- mediatomb-0.12.1/debian/changelog	2012-03-13 20:06:23.000000000 +0000
+++ mediatomb-0.12.1/debian/changelog	2012-03-25 07:25:37.000000000 +0000
@@ -1,8 +1,21 @@
-mediatomb (0.12.1-0ubuntu3~ppa1~precise1) precise; urgency=low
+mediatomb (0.12.1-0ubuntu5~ppa1~precise1) precise; urgency=low
 
-  * Sony Bravia patch 
+  * Add Sony Bravia patch. This makes it work on Sony Bravia TV's.
 
- -- Jonas Pedersen <jonas@chown.dk>  Fri, 09 Dec 2011 21:29:58 +0100
+ -- Jonas Pedersen <jonas@chown.dk>  Sun, 25 Mar 2012 09:24:30 +0200
+
+mediatomb (0.12.1-0ubuntu4) precise; urgency=low
+
+  * Rebuild for libmysqlclient transition
+
+ -- Clint Byrum <clint@ubuntu.com>  Wed, 23 Nov 2011 23:55:08 -0800
+
+mediatomb (0.12.1-0ubuntu3) precise; urgency=low
+
+  * debian/patches/fix-ffmpeg-metadata.patch: properly parse the bitrate
+    and the number of audio channels. (LP: #875098)
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Sun, 16 Oct 2011 18:14:27 -0400
 
 mediatomb (0.12.1-0ubuntu2) oneiric; urgency=low
 
diff -Nru mediatomb-0.12.1/debian/patches/fix-ffmpeg-metadata.patch mediatomb-0.12.1/debian/patches/fix-ffmpeg-metadata.patch
--- mediatomb-0.12.1/debian/patches/fix-ffmpeg-metadata.patch	1970-01-01 00:00:00.000000000 +0000
+++ mediatomb-0.12.1/debian/patches/fix-ffmpeg-metadata.patch	2011-10-16 22:15:51.000000000 +0000
@@ -0,0 +1,69 @@
+Description: properly parse the bitrate in bytes/second and the number of
+ audio channels (not audio streams)
+Author: Marc Deslauriers <marc.deslauriers@canonical.com>
+Forwarded: yes, http://sourceforge.net/support/tracker.php?aid=3424145
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mediatomb/+bug/875098
+
+Index: mediatomb-0.12.1/src/metadata/ffmpeg_handler.cc
+===================================================================
+--- mediatomb-0.12.1.orig/src/metadata/ffmpeg_handler.cc	2011-10-16 18:10:28.000000000 -0400
++++ mediatomb-0.12.1/src/metadata/ffmpeg_handler.cc	2011-10-16 18:13:22.488137464 -0400
+@@ -195,9 +195,11 @@
+ 	// bitrate
+     if (pFormatCtx->bit_rate > 0)  
+     {
++        // ffmpeg's bit_rate is in bits/sec, upnp wants it in bytes/sec
++        // See http://www.upnp.org/schemas/av/didl-lite-v3.xsd
+         log_debug("Added overall bitrate: %d kb/s\n", 
+-                  pFormatCtx->bit_rate/1000);
+-        item->getResource(0)->addAttribute(MetadataHandler::getResAttrName(R_BITRATE), String::from(pFormatCtx->bit_rate/1000));
++                  pFormatCtx->bit_rate/8);
++        item->getResource(0)->addAttribute(MetadataHandler::getResAttrName(R_BITRATE), String::from(pFormatCtx->bit_rate/8));
+     }
+ 
+ 	// video resolution, audio sampling rate, nr of audio channels
+@@ -236,30 +238,27 @@
+                 *x = st->codec->width;
+                 *y = st->codec->height;
+ 			}
+-		} 
+-		if(st->codec->codec_type == AVMEDIA_TYPE_AUDIO) 
++		}
++		if((st != NULL) && (audioset == false) && (st->codec->codec_type == AVMEDIA_TYPE_AUDIO))
+         {
+-			// Increase number of audiochannels
+-			audioch++;
+-			// Get the sample rate
+-			if ((audioset == false) && (st->codec->sample_rate > 0)) 
++			// find the first stream that has a valid sample rate
++			if (st->codec->sample_rate > 0)
+             {
+ 				samplefreq = st->codec->sample_rate;
+-			    if (samplefreq > 0) 
+-                {
+-		    	    log_debug("Added sample frequency: %d Hz\n", samplefreq);
+-		        	item->getResource(0)->addAttribute(MetadataHandler::getResAttrName(R_SAMPLEFREQUENCY), String::from(samplefreq));
+-					audioset = true;
+-    			}
++	    	    log_debug("Added sample frequency: %d Hz\n", samplefreq);
++	        	item->getResource(0)->addAttribute(MetadataHandler::getResAttrName(R_SAMPLEFREQUENCY), String::from(samplefreq));
++				audioset = true;
++
++				audioch = st->codec->channels;
++			    if (audioch > 0) 
++			    {
++			        log_debug("Added number of audio channels: %d\n", audioch);
++			        item->getResource(0)->addAttribute(MetadataHandler::getResAttrName(R_NRAUDIOCHANNELS), String::from(audioch));
++			    }
+ 			}
+ 		}
+ 	}
+ 
+-    if (audioch > 0) 
+-    {
+-        log_debug("Added number of audio channels: %d\n", audioch);
+-        item->getResource(0)->addAttribute(MetadataHandler::getResAttrName(R_NRAUDIOCHANNELS), String::from(audioch));
+-    }
+ } // addFfmpegResourceFields
+ 
+ /*double time_to_double(struct timeval time) {
diff -Nru mediatomb-0.12.1/debian/patches/series mediatomb-0.12.1/debian/patches/series
--- mediatomb-0.12.1/debian/patches/series	2011-12-09 20:36:04.000000000 +0000
+++ mediatomb-0.12.1/debian/patches/series	2012-03-25 07:26:16.000000000 +0000
@@ -3,4 +3,5 @@
 const_char_conversion.patch
 mediatomb-0.12.1-gcc46.patch
 libav_0.7_support.patch
+fix-ffmpeg-metadata.patch
 sony_bravia.patch