[FFmpeg-cvslog] Merge commit '39c2880eeae6930b1036ce1f479afc1e1152c13f'

Michael Niedermayer git at videolan.org
Mon Feb 24 22:19:03 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 24 22:13:42 2014 +0100| [6b06f9f1bc4c51a96186021bf0f99599e49aff47] | committer: Michael Niedermayer

Merge commit '39c2880eeae6930b1036ce1f479afc1e1152c13f'

* commit '39c2880eeae6930b1036ce1f479afc1e1152c13f':
  af_volume: preserve frame properties

Conflicts:
	libavfilter/af_volume.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6b06f9f1bc4c51a96186021bf0f99599e49aff47
---





More information about the ffmpeg-cvslog mailing list