Merge commit '18f2514c4037befd37b02e4d4f10c159edf3b26f'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 15:13:05 +0000 (17:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 15:13:05 +0000 (17:13 +0200)
commit7426acff1aed209bc7db4c87697a5931e177eaf1
treee61531c6a0f689f94d98ffeb7fca8e921bb390e5
parente77b9853ea66ef6c34b04d121c5b3d1afaa33971
parent18f2514c4037befd37b02e4d4f10c159edf3b26f
Merge commit '18f2514c4037befd37b02e4d4f10c159edf3b26f'

* commit '18f2514c4037befd37b02e4d4f10c159edf3b26f':
  mov: export stsd Compressorname in metadata

Conflicts:
libavformat/mov.c

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