[FFmpeg-cvslog] Merge commit 'a1e2caa93e4f8102666a21222f01b74838b6497f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  1 04:15:27 2015 +0200| [55a04a5d7a90a2eddcfe1fe407c403ba95b281b8] | committer: Michael Niedermayer

Merge commit 'a1e2caa93e4f8102666a21222f01b74838b6497f'

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

Conflicts:
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=55a04a5d7a90a2eddcfe1fe407c403ba95b281b8
---