Merge commit '853cc025d63ee2539fc0460dab62c5b9a3fd2043'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 17:21:53 +0000 (19:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 17:21:53 +0000 (19:21 +0200)
commit07941c2cb28d6a80f628e035d61ab437d9719bf0
tree24cb5c00fde296dc99c8fcac6dfd8727a9e5dbf3
parentef1d4ee2f8b621a009d482d5b183a905bcb1cd74
parent853cc025d63ee2539fc0460dab62c5b9a3fd2043
Merge commit '853cc025d63ee2539fc0460dab62c5b9a3fd2043'

* commit '853cc025d63ee2539fc0460dab62c5b9a3fd2043':
  mov: store display matrix in a stream side data

Conflicts:
libavformat/isom.h
libavformat/mov.c

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