Merge commit '35384934d6e27e0334060a23a0c83a3cb5cef198'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 20:59:08 +0000 (21:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 20:59:08 +0000 (21:59 +0100)
commit82f0f0482ed67f32414df7791e26cc473cdcb3bb
tree598c028eae3f900578e5c89c507d68331f619000
parent74622ad320bbd3e01674224e67b59b09f22c38d6
parent35384934d6e27e0334060a23a0c83a3cb5cef198
Merge commit '35384934d6e27e0334060a23a0c83a3cb5cef198'

* commit '35384934d6e27e0334060a23a0c83a3cb5cef198':
  mov: cosmetics: reorder the list of tags

Conflicts:
libavformat/mov.c

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