ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Sat Aug
23 02:45:00 2014 +0200| [35fe089dd9b667bb5e7537b35a0d03b6bcb01b0c] | committer:
Michael Niedermayer
Merge commit 'b3f48a5044fd04539337e91d28022207c9d3b9e8' into release/2.2
* commit 'b3f48a5044fd04539337e91d28022207c9d3b9e8':
proresenc: Remove unneeded parameters from encode_alpha_plane()
Conflicts:
libavcodec/proresenc_kostya.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35fe089dd9b667bb5e7537b35a0d03b6bcb01b0c
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
