Commit 1aefba7e authored by Gildas Bazin's avatar Gildas Bazin

* Added MPEG 1 to the list of encapsulation methods (useful to produce files playable by WMP).
parent 57effc14
......@@ -2,7 +2,7 @@
* streamout.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: streamout.cpp,v 1.24 2003/07/12 13:33:10 gbazin Exp $
* $Id: streamout.cpp,v 1.25 2003/07/20 15:33:53 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -73,6 +73,7 @@ enum
{
TS_ENCAPSULATION = 0,
PS_ENCAPSULATION,
MPEG1_ENCAPSULATION,
AVI_ENCAPSULATION,
OGG_ENCAPSULATION,
ENCAPS_NUM,
......@@ -281,6 +282,9 @@ void SoutDialog::UpdateMRL()
case PS_ENCAPSULATION:
encapsulation = wxT("ps");
break;
case MPEG1_ENCAPSULATION:
encapsulation = wxT("mpeg1");
break;
case AVI_ENCAPSULATION:
encapsulation = wxT("avi");
break;
......@@ -531,6 +535,7 @@ wxPanel *SoutDialog::EncapsulationPanel( wxWindow* parent )
{
wxT("MPEG TS"),
wxT("MPEG PS"),
wxT("MPEG 1"),
wxT("AVI"),
wxT("Ogg"),
wxT("MP4/MOV")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment