[transmageddon] Add support for mpeg1 video and mpeg2 audio

[Christian Fredrik Kalager Schaller <uraeus src gnome org>]

commit fe23ca61bec653d30b1b38485cb5e237ca1a7241
Author: Christian Fredrik Kalager Schaller <christian schaller collabora co uk>
Date:   Tue May 31 10:17:40 2011 +0100

    Add support for mpeg1 video and mpeg2 audio

 src/codecfinder.py   |    6 ++++--
 src/transmageddon.py |    8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/src/codecfinder.py b/src/codecfinder.py
index d01b03f..da22f09 100644
--- a/src/codecfinder.py
+++ b/src/codecfinder.py
@@ -41,7 +41,7 @@ containermap = { 'Ogg' : "application/ogg", \
         'Quicktime' : "video/quicktime,variant=apple", \
         'MPEG4' : "video/quicktime,variant=iso", \
         'MPEG PS' : "video/mpeg,mpegversion=2,systemstream=true", \
-        'MPEG TS' : "video/mpegts", \
+        'MPEG TS' : "video/mpegts,systemstream=true", \
         'FLV' : "video/x-flv", \
         '3GPP' : "video/quicktime,variant=3gpp", \
         'ASF' : "video/x-ms-asf, parsed=true", \
@@ -97,7 +97,9 @@ codecmap = { 'Vorbis' : "audio/x-vorbis", \
         'divx4' : "video/x-divx,divxversion=4", \
         'AMR-NB' : "audio/AMR", \
         'H263+' : "video/x-h263,variant=itu,h263version=h263p", \
-        'On2 vp8' : "video/x-vp8"}
+        'On2 vp8' : "video/x-vp8", \
+        'mp2' : "audio/mpeg,mpegversion=(int)1, layer=(int)2", \
+        'MPEG1' : "video/mpeg,mpegversion=(int)1,systemstream=false"}
 
 #####
 #This code checks for available muxers and return a unique caps string
diff --git a/src/transmageddon.py b/src/transmageddon.py
index f42273e..ed1be64 100644
--- a/src/transmageddon.py
+++ b/src/transmageddon.py
@@ -111,8 +111,8 @@ supported_video_container_map = {
     'Quicktime':  [ 'H264', 'Dirac', 'MPEG2', 'MPEG4', 'On2 vp8' ],
     'MPEG4':      [ 'H264', 'MPEG2', 'MPEG4' ],
     '3GPP':       [ 'H264', 'MPEG2', 'MPEG4', 'H263+' ],
-    'MPEG PS':    [ 'MPEG2','H264', 'MPEG4' ],
-    'MPEG TS':    [ 'H264', 'MPEG2', 'MPEG4', 'Dirac' ],
+    'MPEG PS':    [ 'MPEG2', 'MPEG1', 'H264', 'MPEG4' ],
+    'MPEG TS':    [ 'MPEG2', 'MPEG1', 'H264', 'MPEG4', 'Dirac' ],
     'FLV':        [ 'H264' ],
     'ASF':        [ 'Windows Media Video 2' ],
     'WebM':       [ 'On2 vp8']
@@ -126,8 +126,8 @@ supported_audio_container_map = {
     'Quicktime':   [ 'AAC', 'AC3', 'mp3' ],
     'MPEG4':       [ 'AAC', 'mp3' ],
     '3GPP':        [ 'AAC', 'mp3', 'AMR-NB' ],
-    'MPEG PS':     [ 'mp3', 'AC3', 'AAC' ],
-    'MPEG TS':     [ 'mp3', 'AC3', 'AAC' ],
+    'MPEG PS':     [ 'mp3', 'AC3', 'AAC', 'mp2' ],
+    'MPEG TS':     [ 'mp3', 'AC3', 'AAC', 'mp2' ],
     'FLV':         [ 'mp3' ],
     'ASF':         [ 'Windows Media Audio 2', 'mp3'],
     'WebM':        [ 'Vorbis']