ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Sat Aug
23 02:59:22 2014 +0200| [8b55f67e3ee3dabb11877aa0df2ba56d1423be43] | committer:
Michael Niedermayer
Merge commit 'f25f5f8c62ec7728ee7f5dcc8f1abd0dc6235735' into release/2.2
* commit 'f25f5f8c62ec7728ee7f5dcc8f1abd0dc6235735':
proresenc: Properly account for alpha plane
Conflicts:
libavcodec/proresenc_kostya.c
See: 1578986a0da41ab417ddddf5964fa192d27b759f
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b55f67e3ee3dabb11877aa0df2ba56d1423be43
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
