Merge commit 'a1e2caa93e4f8102666a21222f01b74838b6497f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 02:15:27 +0000 (04:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 02:15:27 +0000 (04:15 +0200)
* commit 'a1e2caa93e4f8102666a21222f01b74838b6497f':
  mov: Log format rather than fourcc in stsd in trace mode

Conflicts:
libavformat/mov.c

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

No differences found