[FFmpeg-cvslog] Merge commit '35cbc98b720db95b923cb2d745f77bb2ee4363dc'
Michael Niedermayer
git at videolan.org
Wed Sep 4 13:03:15 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 4 12:56:28 2013 +0200| [f1b15c1ef9d8d69b3c8687c0eb34edc7a1d8687a] | committer: Michael Niedermayer
Merge commit '35cbc98b720db95b923cb2d745f77bb2ee4363dc'
* commit '35cbc98b720db95b923cb2d745f77bb2ee4363dc':
alac: Check that the channels fit at the given offset
Conflicts:
libavcodec/alac.c
See: b53f89710b03c4c832bb03e4e132b1ace17fb4e4
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f1b15c1ef9d8d69b3c8687c0eb34edc7a1d8687a
---
More information about the ffmpeg-cvslog
mailing list