ff_ffplay: merge
ff_ffplay.c: merge
test
ffplay: improve error handle
ios/IJKFFOptions: set timeout