From: Sergey M․ <dstftw@gmail.com>
Date: Sat, 4 Apr 2015 17:05:25 +0000 (+0600)
Subject: [extractor/common] Remove f4m section
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=e21a55abcc502abac559027551751ff84d215077;p=youtube-dl

[extractor/common] Remove f4m section

It's now provided by `f4m_id`
---

diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index e5245ec3f..530c449c1 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -822,7 +822,7 @@ class InfoExtractor(object):
                                 (media_el.attrib.get('href') or media_el.attrib.get('url')))
             tbr = int_or_none(media_el.attrib.get('bitrate'))
             formats.append({
-                'format_id': '-'.join(filter(None, [f4m_id, 'f4m-%d' % (i if tbr is None else tbr)])),
+                'format_id': '-'.join(filter(None, [f4m_id, compat_str(i if tbr is None else tbr)])),
                 'url': manifest_url,
                 'ext': 'flv',
                 'tbr': tbr,