[FFmpeg-cvslog] Merge commit 'bc6461c2861b7d482a037d3b3e2b44ad48805fa0'

Michael Niedermayer git at videolan.org
Sat Mar 1 13:23:11 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar  1 13:18:25 2014 +0100| [f0ce3854fda36fd67b59421aec939f32a4910515] | committer: Michael Niedermayer

Merge commit 'bc6461c2861b7d482a037d3b3e2b44ad48805fa0'

* commit 'bc6461c2861b7d482a037d3b3e2b44ad48805fa0':
  af_compand: replace strtok_r() with av_get_token()

Conflicts:
	configure
	libavfilter/af_compand.c

Not merged as requested by ubitux
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list