[FFmpeg-cvslog] Merge commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192'
Michael Niedermayer
git at videolan.org
Mon Jul 7 00:09:57 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 7 00:04:22 2014 +0200| [28c03195174719c6683ecd3c411eb35e5bb29a38] | committer: Michael Niedermayer
Merge commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192'
* commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192':
dsicin: Split audio and video decoder
Conflicts:
libavcodec/Makefile
libavcodec/dsicinvideo.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=28c03195174719c6683ecd3c411eb35e5bb29a38
---
More information about the ffmpeg-cvslog
mailing list