* commit 'a1e2caa9':
  mov: Log format rather than fourcc in stsd in trace mode

Conflicts:
	libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>