openlp-core team mailing list archive

[Jonathan Stafford <staffj01@xxxxxxxxx>]

Jonathan Stafford has proposed merging lp:~staffj01/openlp/bug-900727 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #900727 in OpenLP: "Phonon backend no longer plays .mp4 video files"
  https://bugs.launchpad.net/openlp/+bug/900727

For more details, see:
https://code.launchpad.net/~staffj01/openlp/bug-900727/+merge/90235

Fixes bug-900727:Phonon backend no longer plays .mp4 videos.

Added mimetype additional extension.
-- 
https://code.launchpad.net/~staffj01/openlp/bug-900727/+merge/90235
Your team OpenLP Core is requested to review the proposed merge of lp:~staffj01/openlp/bug-900727 into lp:openlp.

=== modified file 'openlp/core/ui/media/phononplayer.py'
--- openlp/core/ui/media/phononplayer.py	2011-12-02 21:13:05 +0000
+++ openlp/core/ui/media/phononplayer.py	2012-01-26 02:55:26 +0000
@@ -51,6 +51,7 @@
             u'video/x-matroska': [u'.mpv', u'.mkv'],
             u'video/x-wmv': [u'.wmv'],
             u'video/x-mpg': [u'.mpg'],
+            u'video/mpeg' : [u'.mp4', u'.mts'],
             u'video/x-ms-wmv': [u'.wmv']}