[FFmpeg-cvslog] Merge commit '3802833bc1f79775a1547c5e427fed6e92b77e53'
Michael Niedermayer
git at videolan.org
Fri Jul 12 14:50:31 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 12 14:42:00 2013 +0200| [cce254373c41b0b6c92cf71ad3099327a9f7b523] | committer: Michael Niedermayer
Merge commit '3802833bc1f79775a1547c5e427fed6e92b77e53'
* commit '3802833bc1f79775a1547c5e427fed6e92b77e53':
dca: Respect the current limits in the downmixing capabilities
Conflicts:
libavcodec/dcadec.c
See: 8e77c3846e91b1af9df4084736257d9899156eef
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cce254373c41b0b6c92cf71ad3099327a9f7b523
---
More information about the ffmpeg-cvslog
mailing list