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)
commit55a04a5d7a90a2eddcfe1fe407c403ba95b281b8
treebcd8be47748d8f15f79d32ff47060ed521aa5534
parent35c8dda5c2dbeb37c659f964372edf6f2bde3b5f
parenta1e2caa93e4f8102666a21222f01b74838b6497f
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@gmx.at>
libavformat/mov.c