[FFmpeg-cvslog] Merge commit 'b3f48a5044fd04539337e91d28022207c9d3b9e8' into release/2.2
Michael Niedermayer
git at videolan.org
Sat Aug 23 02:58:23 CEST 2014
ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at 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 <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35fe089dd9b667bb5e7537b35a0d03b6bcb01b0c
---
More information about the ffmpeg-cvslog
mailing list