[FFmpeg-cvslog] Merge commit '9a07fac678a8540d076e635061bbaa4ed09a9431'

Michael Niedermayer git at videolan.org
Thu Apr 10 21:31:57 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 10 20:23:40 2014 +0200| [6e573b77597c1039667b5d7916551b488aeef828] | committer: Michael Niedermayer

Merge commit '9a07fac678a8540d076e635061bbaa4ed09a9431'

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

Conflicts:
	libavformat/Makefile
	libavformat/mov.c

See: 37a15f3e669372075c88254e070c971aecb485aa
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e573b77597c1039667b5d7916551b488aeef828
---





More information about the ffmpeg-cvslog mailing list