ffmpeg | branch: master | Michael Niedermayer <mich...@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 <mich...@niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9c31b396413a90f55e82a01cb6b6f1fbe048a156
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
