Merge commit '9a07fac678a8540d076e635061bbaa4ed09a9431'

Browse Source

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

Conflicts:
	libavformat/Makefile
	libavformat/mov.c

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

pull/64/head

Michael Niedermayer 11 years ago

parent c486cfab79 9a07fac678

commit 6e573b7759

2 changed files with 98 additions and 1 deletions

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Write Preview

Loading…

Cancel

Save