Merge commit '9a07fac678a8540d076e635061bbaa4ed09a9431'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Apr 2014 18:23:40 +0000 (20:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Apr 2014 19:25:15 +0000 (21:25 +0200)
commit6e573b77597c1039667b5d7916551b488aeef828
treeb3c7256418744bf78ee5f7e8aac5cc9e9a2d0896
parentc486cfab792e53de3f5fc9f5082909ce687a3fe8
parent9a07fac678a8540d076e635061bbaa4ed09a9431
Merge commit '9a07fac678a8540d076e635061bbaa4ed09a9431'

* commit '9a07fac678a8540d076e635061bbaa4ed09a9431':
  mov: read hydrogenaudio replaygain information

Conflicts:
libavformat/Makefile
libavformat/mov.c

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