Merge commit '202b5f6d'

* commit '202b5f6d':
  doc: Fix some obsolete references to av* tools as ff* tools

Conflicts:
	doc/demuxers.texi

No code changes, merge for metadata only
Merged-by: Michael Niedermayer <michaelni@gmx.at>