remove unnecessary flush buffer in encoder
Rollup of Gecko Media Plugin patches
Merge pull request #981 from ethanhugg/gmp_rollup

Rollup of Gecko Media Plugin patches
Merge pull request #980 from huili2/enc_remove_bsflush

remove unnecessary flush buffer in encoder
Merge remote-tracking branch 'upstream/master' into travis.osx

Conflicts:
	.travis.yml