diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-10 20:23:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-10 21:25:15 +0200 |
| commit | 6e573b77597c1039667b5d7916551b488aeef828 (patch) | |
| tree | b3c7256418744bf78ee5f7e8aac5cc9e9a2d0896 /libavformat/asf.h | |
| parent | c486cfab792e53de3f5fc9f5082909ce687a3fe8 (diff) | |
| parent | 9a07fac678a8540d076e635061bbaa4ed09a9431 (diff) | |
| download | ffmpeg-6e573b77597c1039667b5d7916551b488aeef828.tar.gz | |
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>
Diffstat (limited to 'libavformat/asf.h')
0 files changed, 0 insertions, 0 deletions