Update configure script to reflect newer ffmpeg/libav
Merge branch 'master' into remove_subimage