summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorDaniel Sikeler <d.sikeler94@gmail.com>2014-08-28 12:18:10 +0000
committerThomas Arnhold <thomas@arnhold.org>2014-09-12 08:43:05 +0000
commit18e39b06705f3fa851573151fce69188dbf8bcd9 (patch)
tree1cbf214adca40a6d738f70b670149f7b198ea414 /avmedia
parentf3cdb7804a26c5cf0623d9b83130594f83372768 (diff)
fdo#82994: added missing media extensions
(cherry-picked from commit f43d50d1e470dbfbadb4e90135069f0ca89d65c7) Change-Id: Ibbce02b43192fd3afb4984f5f38251a518d7be06 Reviewed-on: https://gerrit.libreoffice.org/11172 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/11401 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/viewer/mediawindow.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index e586a587e2ef..dc016caf5b6f 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -201,17 +201,22 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
{
static const char* pFilters[] = { "Advanced Audio Coding", "aac",
"AIF Audio", "aif;aiff",
+ "Advanced Systems", "asf",
"AU Audio", "au",
+ "Audio Codec", "ac3",
"AVI", "avi",
"CD Audio", "cda",
+ "Digital Video", "dv",
"FLAC Audio", "flac",
"Flash Video", "flv",
"Matroska Media", "mkv",
"MIDI Audio", "mid;midi",
- "MPEG Audio", "mp2;mp3;mpa",
+ "MPEG Audio", "mp2;mp3;mpa;m4a",
"MPEG Video", "mpg;mpeg;mpv;mp4;m4v",
"Ogg Audio", "ogg;oga",
"Ogg Video", "ogv;ogx",
+ "Real Audio", "ra",
+ "Real Media", "rm",
"RMI MIDI Audio", "rmi",
"SND (SouND) Audio", "snd",
"Quicktime Video", "mov",