[FFmpeg-cvslog] Merge commit 'b9589f5a770ec2357ab7920a5fabe8510b8601f9'
Michael Niedermayer
git at videolan.org
Wed Oct 30 10:24:22 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 30 10:13:23 2013 +0100| [558784f113f1436a48f34db2612c3b6460e6c734] | committer: Michael Niedermayer
Merge commit 'b9589f5a770ec2357ab7920a5fabe8510b8601f9'
* commit 'b9589f5a770ec2357ab7920a5fabe8510b8601f9':
lavc: add error checking to apply_param_change.
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=558784f113f1436a48f34db2612c3b6460e6c734
---
More information about the ffmpeg-cvslog
mailing list