Merge branch 'plain' into kaudio

Conflicts:
	input/avs.c
Merge branch 'kaudio' into mod
submodule
Update submodule
Merge branch 'plain' into mod
update l-smash to 062fee7
change basebranch
configure: Add --disable-mp3 option
always use strict=-2 for aac

FFmpeg internal aac encoder needs this.
assume channels = 2 when can't get them
don't print useless info from libav
I prefer ffaac to libvo_aacenc
Add --chpl-with-bom option
Add an option to use r2204 style progress indicator
Film Grain Optimization
Fade Compensation
Remove stats before renaming
Add a parameter to set level of writing options in User Data Unregistered SEI
Auto VBV settings
Log file