add option field zo monitors
max executable
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
add generic Option field to ffmpeg and libvlc cameras
testing/fixing
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
add Options field to zm_create.sql.in
add debug and warn messages
add quotes to option debug/warn messages
modify debug message
change check for av_dict_set success
add help window for ffmpeg/libvlc options
fix option help text for overlooked languages
add select list for rtsp method for ffmpeg and libvlc
change examples for options
remove unwanted comment change
Merge pull request #421 from m-bene/ffmpegoptions

Add optional options field for ffmpeg and VLC source types
add libav-tools as an option instead of ffmpeg
Add Bountysource badge to README

Because you have some open bounties, we thought you might want to display this badge in your README!