[FFmpeg-cvslog] Merge commit '949c603ed9210df0e1b8e1aa82c71b93543d8071'

Michael Niedermayer git at videolan.org
Wed May 1 10:17:32 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  1 10:11:01 2013 +0200| [a1b88797144111262b07cde42b038387a3c6578b] | committer: Michael Niedermayer

Merge commit '949c603ed9210df0e1b8e1aa82c71b93543d8071'

* commit '949c603ed9210df0e1b8e1aa82c71b93543d8071':
  af_channelmap: remove now unnecessary goto
  vf_split: fix description

Conflicts:
	libavfilter/split.c

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

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





More information about the ffmpeg-cvslog mailing list