[FFmpeg-cvslog] Merge commit 'e1f3847f860a1094a46be4c5f10db8df616c3135'
Michael Niedermayer
git at videolan.org
Tue Sep 17 15:22:27 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 17 15:16:01 2013 +0200| [7163bbefa26d634eae7bac8f0d891f2bca270eb9] | committer: Michael Niedermayer
Merge commit 'e1f3847f860a1094a46be4c5f10db8df616c3135'
* commit 'e1f3847f860a1094a46be4c5f10db8df616c3135':
mace: Make sure that the channel count is set to a valid value
Conflicts:
libavcodec/mace.c
See: 6df1cfa7e4d488051d7b5033c0c69df970db9f82
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7163bbefa26d634eae7bac8f0d891f2bca270eb9
---
More information about the ffmpeg-cvslog
mailing list