Merge commit '6f26f14f134e753d6168591f30815b1c08c1498b'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Nov 2014 13:01:23 +0000 (14:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Nov 2014 13:01:50 +0000 (14:01 +0100)
commit7a19a8fb696f700bee96c983b825f80f3b3a82f6
treee9f813bfdd73e784aa32cccfbf599e8ea9e29c66
parent96398cc12332bd0bd8acf921bfa310ed12146efd
parent6f26f14f134e753d6168591f30815b1c08c1498b
Merge commit '6f26f14f134e753d6168591f30815b1c08c1498b'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tools/sidxindex.c