[FFmpeg-cvslog] Merge commit '6f26f14f134e753d6168591f30815b1c08c1498b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 24 14:01:23 2014 +0100| [7a19a8fb696f700bee96c983b825f80f3b3a82f6] | committer: Michael Niedermayer

Merge commit '6f26f14f134e753d6168591f30815b1c08c1498b'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7a19a8fb696f700bee96c983b825f80f3b3a82f6
---