r21727: Must refer to option name instead of internal variable r21758: Subtitle formats are listed in subreader.h, not libmpdemux/demuxer.h. r21848: clarify a few things about the interaction between *cmp and mbd options r21865: Audio track switching works with DVDs as well. r21882: sync to x264 r607 (update description of threads)