empathicqubit/lsnes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'rr1-maint'

Browse source 
Conflicts:
	src/video/avi.cpp
This commit is contained in:
Ilari Liusvaara 2013-02-02 01:39:55 +02:00
commit c3ae963cbe
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/video/avi.cpp
View file

@ -86,9 +86,9 @@ namespace
numeric_setting drb(lsnes_set, "avi-right-border", 0, 8191, 0);
numeric_setting max_frames_per_segment(lsnes_set, "avi-maxframes", 0, 999999999, 0);
#ifdef WITH_SECRET_RABBIT_CODE
numeric_setting soundrate_setting(lsnes_set, "avi-soundrate", 0, 5, 0);
numeric_setting soundrate_setting(lsnes_set, "avi-soundrate", 0, 5, 5);
#else
numeric_setting soundrate_setting(lsnes_set, "avi-soundrate", 0, 3, 0);
numeric_setting soundrate_setting(lsnes_set, "avi-soundrate", 0, 3, 3);
#endif
std::pair<avi_video_codec_type*, avi_audio_codec_type*> find_codecs(const std::string& mode)