diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 15:11:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 15:11:08 +0100 |
| commit | 1034fbdf53003eb74ad30576d1f2205abc429357 (patch) | |
| tree | bab68afb4da4a0f38228a697f158812f04706c5c /libavfilter/vf_showinfo.c | |
| parent | 8de75f703adafced474ddf748c46d091ee0a8f4a (diff) | |
| parent | 15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7 (diff) | |
Merge commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7'
* commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7':
mp3dec: export replaygain tags from ID3v2
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_showinfo.c')
0 files changed, 0 insertions, 0 deletions