* qatar/master:
  build: fix 'clean' target
  ZeroCodec: Flip output

Conflicts:
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>