[FFmpeg-cvslog] Merge commit '55c4cba2a7037161ea56b2d55b347c8381df7f1e'
Michael Niedermayer
git at videolan.org
Tue Jul 30 09:55:58 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 30 09:50:26 2013 +0200| [947f2d4d34f29a8bc51fd4a97718b1c163d7a55d] | committer: Michael Niedermayer
Merge commit '55c4cba2a7037161ea56b2d55b347c8381df7f1e'
* commit '55c4cba2a7037161ea56b2d55b347c8381df7f1e':
huffyuvenc: BGRA support
Conflicts:
libavcodec/huffyuvenc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=947f2d4d34f29a8bc51fd4a97718b1c163d7a55d
---
More information about the ffmpeg-cvslog
mailing list