[vlc-commits] forgotten renamed ffmpeg options
Rafaël Carré
git at videolan.org
Tue Apr 17 15:25:17 CEST 2012
vlc | branch: master | Rafaël Carré <funman at videolan.org> | Tue Apr 17 09:25:07 2012 -0400| [344a19dc708e498a656b9688a0fb8630570b36db] | committer: Rafaël Carré
forgotten renamed ffmpeg options
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=344a19dc708e498a656b9688a0fb8630570b36db
---
modules/gui/qt4/components/simple_preferences.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index b07d166..c5fdc25 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -470,7 +470,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
ui.live555TransportHTTPRadio->hide();
ui.live555TransportLabel->hide();
}
- CONFIG_BOOL( "ffmpeg-hw", hwAccelBox );
+ CONFIG_BOOL( "avcodec-hw", hwAccelBox );
#ifdef WIN32
HINSTANCE hdxva2_dll = LoadLibrary(TEXT("DXVA2.DLL") );
if( !hdxva2_dll )
@@ -480,7 +480,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
#endif
optionWidgets.append( ui.DVDDeviceComboBox );
optionWidgets.append( ui.cachingCombo );
- CONFIG_GENERIC( "ffmpeg-skiploopfilter", IntegerList, ui.filterLabel, loopFilterBox );
+ CONFIG_GENERIC( "avcodec-skiploopfilter", IntegerList, ui.filterLabel, loopFilterBox );
CONFIG_GENERIC( "sout-x264-tune", StringList, ui.x264Label, tuneBox );
CONFIG_GENERIC( "sout-x264-preset", StringList, ui.x264Label, presetBox );
CONFIG_GENERIC( "sout-x264-profile", StringList, ui.x264profileLabel, profileBox );
More information about the vlc-commits
mailing list