diff options
| author | Techywarrior <techywarrior@gmail.com> | 2013-04-03 20:56:24 -0700 |
|---|---|---|
| committer | Techywarrior <techywarrior@gmail.com> | 2013-04-03 20:56:24 -0700 |
| commit | 54ac6c2d889fb05f9707f5899eb6c6fc48c681cb (patch) | |
| tree | 16644eefa7e4aaf0980b1726137e456f679871de /MediaBrowser.Model/DTO/StreamOptions.cs | |
| parent | b483288f9bb7b6dc1bd530399934b9cf20a52303 (diff) | |
| parent | 5ca339c05577c752afee34bc178a3e7ca1f789f3 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Model/DTO/StreamOptions.cs')
| -rw-r--r-- | MediaBrowser.Model/DTO/StreamOptions.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MediaBrowser.Model/DTO/StreamOptions.cs b/MediaBrowser.Model/DTO/StreamOptions.cs index 79be9fb4b..edb88a18f 100644 --- a/MediaBrowser.Model/DTO/StreamOptions.cs +++ b/MediaBrowser.Model/DTO/StreamOptions.cs @@ -169,6 +169,11 @@ H264, /// <summary> + /// The mpeg4 + /// </summary> + Mpeg4, + + /// <summary> /// The theora /// </summary> Theora, |