Merge commit '4d7ed3e7'

* commit '4d7ed3e7':
  build: output-example: Add avutil to ELIBS in link command

Conflicts:
	libavformat/Makefile

No change as our example build code doesnt have this bug
Merged-by: Michael Niedermayer <michaelni@gmx.at>