[FFmpeg-cvslog] Merge commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b'
Michael Niedermayer
git at videolan.org
Thu Feb 19 21:44:29 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 19 21:31:26 2015 +0100| [dfe5a9f022b38ba292212ce2daff60221e411e10] | committer: Michael Niedermayer
Merge commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b'
* commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b':
lavc: Add DSS SP decoder
Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dfe5a9f022b38ba292212ce2daff60221e411e10
---
More information about the ffmpeg-cvslog
mailing list