[FFmpeg-cvslog] Merge commit 'ee21d270f8dc5fdb2263f5dd87407aae9fe1ecd1' into release/1.1

Michael Niedermayer git at videolan.org
Mon Apr 21 16:56:31 CEST 2014


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 16:42:19 2014 +0200| [cb29eb144b81cfded4d7c9a9220f45834b3d4612] | committer: Michael Niedermayer

Merge commit 'ee21d270f8dc5fdb2263f5dd87407aae9fe1ecd1' into release/1.1

* commit 'ee21d270f8dc5fdb2263f5dd87407aae9fe1ecd1':
  af_channelmap: fix ONE_STR mapping mode

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

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





More information about the ffmpeg-cvslog mailing list