[FFmpeg-cvslog] Merge commit '22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4'

Michael Niedermayer git at videolan.org
Thu Jul 23 12:18:05 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Jul 23 11:56:26 2015 +0200| [9c31b396413a90f55e82a01cb6b6f1fbe048a156] | committer: Michael Niedermayer

Merge commit '22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4'

* commit '22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4':
  af_channelmap: properly set the supported output channel layouts

Conflicts:
	libavfilter/af_channelmap.c

See: 39867f3e098ab304cd3bef0ace19d73617cdb817
Merged-by: Michael Niedermayer <michael at niedermayer.cc>

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





More information about the ffmpeg-cvslog mailing list