ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Mon Aug 18
20:01:14 2014 +0200| [43b769b0c4f438d3f261d53f7fbd23e28606e78a] | committer:
Michael Niedermayer
Merge commit 'b16699f2da9c1d41eff852ec3a0c81f74fd44421'
* commit 'b16699f2da9c1d41eff852ec3a0c81f74fd44421':
proresenc: Remove unneeded parameters from encode_alpha_plane()
Conflicts:
libavcodec/proresenc_kostya.c
See: bf10f09bccdcfdb41b9f5bbae01d55961bfd0693
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=43b769b0c4f438d3f261d53f7fbd23e28606e78a
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
