ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Aug 18
20:27:41 2014 +0200| [cdd0ad7be1f94c4c44219d8afecb6a3e1c23041b] | committer:
Michael Niedermayer
Merge commit '41e1354c101004ccd46dc08d3dd6e956e83a6b51'
* commit '41e1354c101004ccd46dc08d3dd6e956e83a6b51':
proresenc: Properly account for alpha plane
Conflicts:
libavcodec/proresenc_kostya.c
See: 117bc8e6ffc744fedcf77edf2fdb33c964b83370
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cdd0ad7be1f94c4c44219d8afecb6a3e1c23041b
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
