[FFmpeg-cvslog] Merge commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15'
Michael Niedermayer
git at videolan.org
Mon Mar 24 15:10:14 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 24 15:04:47 2014 +0100| [8de75f703adafced474ddf748c46d091ee0a8f4a] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8de75f703adafced474ddf748c46d091ee0a8f4a
---
More information about the ffmpeg-cvslog
mailing list