diff options
author | Max Kellermann <max@duempel.org> | 2013-08-04 14:36:22 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2013-08-04 14:36:22 +0200 |
commit | 9326ce53ecd225269147109d87af763fc3846ddf (patch) | |
tree | 510b468db4f9007502516c1bf7dc8db65c655da6 /src/decoder/FfmpegDecoderPlugin.cxx | |
parent | fcb7233b25f21c15e132a9c0e0de5ab5b4f492c7 (diff) | |
parent | d8217c364a182a12fb8abd19732341af1515ffb0 (diff) | |
download | mpd-9326ce53ecd225269147109d87af763fc3846ddf.tar.gz mpd-9326ce53ecd225269147109d87af763fc3846ddf.tar.xz mpd-9326ce53ecd225269147109d87af763fc3846ddf.zip |
Merge tag 'release-0.17.5'
Diffstat (limited to 'src/decoder/FfmpegDecoderPlugin.cxx')
-rw-r--r-- | src/decoder/FfmpegDecoderPlugin.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/decoder/FfmpegDecoderPlugin.cxx b/src/decoder/FfmpegDecoderPlugin.cxx index f42fc36a3..89e57c874 100644 --- a/src/decoder/FfmpegDecoderPlugin.cxx +++ b/src/decoder/FfmpegDecoderPlugin.cxx @@ -586,6 +586,7 @@ static const char *const ffmpeg_suffixes[] = { }; static const char *const ffmpeg_mime_types[] = { + "application/flv", "application/m4a", "application/mp4", "application/octet-stream", |