[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - avmedia/source

[Daniel Sikeler]

 avmedia/source/viewer/mediawindow.cxx |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit b8e2cdfad4b9a4a88fde930b85e16143f51cfebe
Author: Daniel Sikeler <d.sikeler94 at gmail.com>
Date:   Thu Aug 28 12:18:10 2014 +0000

    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 at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/11398
    Tested-by: Thomas Arnhold <thomas at arnhold.org>
    Reviewed-by: Thomas Arnhold <thomas at arnhold.org>

diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 2d3460e..111f5cc 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -200,17 +200,22 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
 {
     static const char* pFilters[] = { "Advanced Audio Coding", "aac",
                                       "AIF Audio", "aif;aiff",
+                                      "Advanced Systems Format", "asf;wma;wmv",
                                       "AU Audio", "au",
+                                      "AC3 Audio", "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 Audio", "ogg;oga;opus",
                                       "Ogg Video", "ogv;ogx",
+                                      "Real Audio", "ra",
+                                      "Real Media", "rm",
                                       "RMI MIDI Audio", "rmi",
                                       "SND (SouND) Audio", "snd",
                                       "Quicktime Video", "mov",