[vlc-commits] ffmpeg options were renamed
Rafaël Carré
git at videolan.org
Tue Apr 17 15:04:59 CEST 2012
vlc | branch: master | Rafaël Carré <funman at videolan.org> | Tue Apr 17 08:58:15 2012 -0400| [8c78284670645c420258da0e01b30137866c0dd1] | committer: Rafaël Carré
ffmpeg options were renamed
ffmpeg modules were renamed too some time ago
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8c78284670645c420258da0e01b30137866c0dd1
---
modules/gui/hildon/maemo_callbacks.c | 4 ++--
modules/gui/macosx/simple_prefs.m | 4 ++--
modules/stream_out/record.c | 12 ++++++------
modules/stream_out/standard.c | 10 +++++-----
projects/macosx/framework/Sources/VLCLibrary.m | 4 ++--
share/lua/http/index.html | 2 +-
share/lua/http/mobile.html | 2 +-
7 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/modules/gui/hildon/maemo_callbacks.c b/modules/gui/hildon/maemo_callbacks.c
index 831ce8c..a26fed3 100644
--- a/modules/gui/hildon/maemo_callbacks.c
+++ b/modules/gui/hildon/maemo_callbacks.c
@@ -255,9 +255,9 @@ void dropframe_cb( GtkMenuItem *menuitem, gpointer user_data )
intf_thread_t *p_intf = (intf_thread_t *)user_data;
if( gtk_check_menu_item_get_active( GTK_CHECK_MENU_ITEM( menuitem ) ) )
- config_PutInt( p_intf, "ffmpeg-skip-frame", 1 );
+ config_PutInt( p_intf, "avcodec-skip-frame", 1 );
else
- config_PutInt( p_intf, "ffmpeg-skip-frame", 0 );
+ config_PutInt( p_intf, "avcodec-skip-frame", 0 );
}
static int keyModifiersToVLC( GdkEventKey *event )
diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index f4b5152..5fb4a13 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -618,7 +618,7 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
[self setupButton: o_input_avi_pop forIntList: "avi-index"];
[self setupButton: o_input_rtsp_ckb forBoolValue: "rtsp-tcp"];
- [self setupButton: o_input_skipLoop_pop forIntList: "ffmpeg-skiploopfilter"];
+ [self setupButton: o_input_skipLoop_pop forIntList: "avcodec-skiploopfilter"];
[self setupButton: o_input_mkv_preload_dir_ckb forBoolValue: "mkv-preload-local-dir"];
@@ -955,7 +955,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
SaveIntList( o_input_avi_pop, "avi-index" );
config_PutInt( p_intf, "rtsp-tcp", [o_input_rtsp_ckb state] );
- SaveIntList( o_input_skipLoop_pop, "ffmpeg-skiploopfilter" );
+ SaveIntList( o_input_skipLoop_pop, "avcodec-skiploopfilter" );
config_PutInt( p_intf, "mkv-preload-local-dir", [o_input_mkv_preload_dir_ckb state] );
diff --git a/modules/stream_out/record.c b/modules/stream_out/record.c
index 2f31e98..d23d521 100644
--- a/modules/stream_out/record.c
+++ b/modules/stream_out/record.c
@@ -276,7 +276,7 @@ static const muxer_properties_t p_muxers[] = {
M( "wav", "wav", 1, VLC_CODEC_U8, VLC_CODEC_S16L,
VLC_CODEC_S24L, VLC_CODEC_S32L, VLC_CODEC_FL32 ),
- //M( "ffmpeg{mux=flac}", "flac", 1, VLC_CODEC_FLAC ), BROKEN
+ //M( "avformat{mux=flac}", "flac", 1, VLC_CODEC_FLAC ), BROKEN
M( "ogg", "ogg", INT_MAX, VLC_CODEC_VORBIS, VLC_CODEC_SPEEX, VLC_CODEC_FLAC,
VLC_CODEC_SUBT, VLC_CODEC_THEORA, VLC_CODEC_DIRAC ),
@@ -427,11 +427,11 @@ static void OutputStart( sout_stream_t *p_stream )
#if 0
// XXX ffmpeg sefault really easily if you try an unsupported codec
// mov and avi at least segfault
- { "ffmpeg{mux=avi}", "avi" },
- { "ffmpeg{mux=mov}", "mov" },
- { "ffmpeg{mux=mp4}", "mp4" },
- { "ffmpeg{mux=nsv}", "nsv" },
- { "ffmpeg{mux=flv}", "flv" },
+ { "avformat{mux=avi}", "avi" },
+ { "avformat{mux=mov}", "mov" },
+ { "avformat{mux=mp4}", "mp4" },
+ { "avformat{mux=nsv}", "nsv" },
+ { "avformat{mux=flv}", "flv" },
#endif
{ NULL, NULL }
};
diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index 8795afe..72efd20 100644
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -227,9 +227,9 @@ static const char *getMuxFromAlias( const char *psz_alias )
{ "ps", "ps" },
{ "mpeg1","mpeg1" },
{ "wav", "wav" },
- { "flv", "ffmpeg{mux=flv}" },
- { "mkv", "ffmpeg{mux=matroska}"},
- { "webm", "ffmpeg{mux=webm}"},
+ { "flv", "avformat{mux=flv}" },
+ { "mkv", "avformat{mux=matroska}"},
+ { "webm", "avformat{mux=webm}"},
};
if( !psz_alias )
@@ -303,9 +303,9 @@ static void checkAccessMux( sout_stream_t *p_stream, char *psz_access,
msg_Err( p_stream, "mov and mp4 mux are only valid with file output" );
else if( !strncmp( psz_access, "udp", 3 ) )
{
- if( !strncmp( psz_mux, "ffmpeg", 6 ) )
+ if( !strncmp( psz_mux, "ffmpeg", 6 ) || !strncmp( psz_mux, "avformat", 8 ) )
{ /* why would you use ffmpeg's ts muxer ? YOU DON'T LOVE VLC ??? */
- char *psz_ffmpeg_mux = var_CreateGetString( p_stream, "ffmpeg-mux" );
+ char *psz_ffmpeg_mux = var_CreateGetString( p_stream, "sout-avformat-mux" );
if( !psz_ffmpeg_mux || strncmp( psz_ffmpeg_mux, "mpegts", 6 ) )
msg_Err( p_stream, "UDP output is only valid with TS mux" );
free( psz_ffmpeg_mux );
diff --git a/projects/macosx/framework/Sources/VLCLibrary.m b/projects/macosx/framework/Sources/VLCLibrary.m
index a6787c6..149746f 100644
--- a/projects/macosx/framework/Sources/VLCLibrary.m
+++ b/projects/macosx/framework/Sources/VLCLibrary.m
@@ -61,8 +61,8 @@ static VLCLibrary * sharedLibrary = nil;
[defaultParams addObject:@"--no-video-title-show"]; // Don't show the title on overlay when starting to play
[defaultParams addObject:@"--verbose=4"]; // Let's not wreck the logs
#if TARGET_OS_IPHONE
- [defaultParams addObject:@"--ffmpeg-fast"];
- [defaultParams addObject:@"--ffmpeg-skiploopfilter=all"];
+ [defaultParams addObject:@"--avcodec-fast"];
+ [defaultParams addObject:@"--avcodec-skiploopfilter=all"];
[defaultParams addObject:@"--vout=vout_ios"];
[defaultParams addObject:@"--aout=audioqueue"];
#else
diff --git a/share/lua/http/index.html b/share/lua/http/index.html
index 3538187..60ff532 100644
--- a/share/lua/http/index.html
+++ b/share/lua/http/index.html
@@ -169,7 +169,7 @@
if($('#viewContainer').css('display')=='none'){
$('#buttonViewer').click();
}
- var defaultStream = 'new Current broadcast enabled input "'+file+'" output #transcode{vcodec=FLV1,vb=4096,fps=25,scale=1,acodec=mp3,ab=512,samplerate=44100,channels=2}:std{access='+$('#stream_protocol').val()+',mux=ffmpeg{{mux=flv}},dst=0.0.0.0:'+$('#stream_port').val()+'/'+$('#stream_file').val()+'}';
+ var defaultStream = 'new Current broadcast enabled input "'+file+'" output #transcode{vcodec=FLV1,vb=4096,fps=25,scale=1,acodec=mp3,ab=512,samplerate=44100,channels=2}:std{access='+$('#stream_protocol').val()+',mux=avformat{{mux=flv}},dst=0.0.0.0:'+$('#stream_port').val()+'/'+$('#stream_file').val()+'}';
sendVLMCmd('del Current;'+defaultStream+';control Current play');
$('#player').attr('href',$('#stream_protocol').val()+'://'+$('#stream_host').val()+':'+$('#stream_port').val()+'/'+$('#stream_file').val());
current_que = 'stream';
diff --git a/share/lua/http/mobile.html b/share/lua/http/mobile.html
index 9ad0b90..d148eb6 100644
--- a/share/lua/http/mobile.html
+++ b/share/lua/http/mobile.html
@@ -57,7 +57,7 @@
$('#buttonSout').click(function(){
var file = decodeURIComponent($('#buttonPlay').attr('mrl'));
if(file){
- var defaultStream = 'new Current broadcast enabled input "'+file+'" output #transcode{vcodec=FLV1,vb=4096,fps=25,scale=1,acodec=mp3,ab=512,samplerate=44100,channels=2}:std{access='+$('#stream_protocol').val()+',mux=ffmpeg{{mux=flv}},dst=0.0.0.0:'+$('#stream_port').val()+'/'+$('#stream_file').val()+'}';
+ var defaultStream = 'new Current broadcast enabled input "'+file+'" output #transcode{vcodec=FLV1,vb=4096,fps=25,scale=1,acodec=mp3,ab=512,samplerate=44100,channels=2}:std{access='+$('#stream_protocol').val()+',mux=avformat{{mux=flv}},dst=0.0.0.0:'+$('#stream_port').val()+'/'+$('#stream_file').val()+'}';
sendVLMCmd('del Current;'+defaultStream+';control Current play','window.location="mobile_view.html"');
}
return false;
More information about the vlc-commits
mailing list