diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 15:04:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 15:04:47 +0100 |
| commit | 8de75f703adafced474ddf748c46d091ee0a8f4a (patch) | |
| tree | 994e24bf92fa5c758a9b02e531aab8f947505d8f /libavdevice/vfwcap.c | |
| parent | 3e1f24131ac018c8b4bcc852a02ccfadf20d1dbb (diff) | |
| parent | 06c3cd3c0186803619bc6aad2d8f06c3e9015d15 (diff) | |
| download | ffmpeg-8de75f703adafced474ddf748c46d091ee0a8f4a.tar.gz | |
Merge commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15'
* commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15':
af_volume: support using replaygain frame side data
Conflicts:
doc/filters.texi
libavfilter/af_volume.c
libavfilter/af_volume.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/vfwcap.c')
0 files changed, 0 insertions, 0 deletions