From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 24 Nov 2014 13:01:23 +0000 (+0100)
Subject: Merge commit '6f26f14f134e753d6168591f30815b1c08c1498b'
X-Git-Tag: n2.6-dev~196
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/7a19a8fb696f700bee96c983b825f80f3b3a82f6

Merge commit '6f26f14f134e753d6168591f30815b1c08c1498b'

* commit '6f26f14f134e753d6168591f30815b1c08c1498b':
  sidxindex: Write mimeType=audio/mp4 for audio-only representations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

7a19a8fb696f700bee96c983b825f80f3b3a82f6