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

[Daniel Sikeler]

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

New commits:
commit 1d3a8908fe8a441469ffd336a445c2b361db5d7f
Author: Daniel Sikeler <d.sikeler94 at gmail.com>
Date:   Wed Sep 10 11:56:42 2014 +0000

    fdo#82994 Added some more audio formats
    
    (cherry-picked from commit 380a4618dd8205c56a5c6622e01e88ae8911fe5e)
    
    Change-Id: I0acd880dc1886f46e1fe146941f1027c9b6ab265
    Reviewed-on: https://gerrit.libreoffice.org/11388
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/11403
    Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
    Tested-by: Thomas Arnhold <thomas at arnhold.org>

diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 1e40f85..64e270a 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -201,7 +201,7 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
 {
     static const char* pFilters[] = { "Advanced Audio Coding", "aac",
                                       "AIF Audio", "aif;aiff",
-                                      "Advanced Systems", "asf",
+                                      "Advanced Systems Format", "asf;wma;wmv",
                                       "AU Audio", "au",
                                       "AC3 Audio", "ac3",
                                       "AVI", "avi",
@@ -213,7 +213,7 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
                                       "MIDI Audio", "mid;midi",
                                       "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",