[FFmpeg-cvslog] Merge commit '2578f1efd64f4efc30114c328d1eff9030429e59'
Michael Niedermayer
git at videolan.org
Mon Jun 10 10:39:44 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 10 10:33:43 2013 +0200| [42b8296f36378c1cbd4fa7d278696196e1c49e5d] | committer: Michael Niedermayer
Merge commit '2578f1efd64f4efc30114c328d1eff9030429e59'
* commit '2578f1efd64f4efc30114c328d1eff9030429e59':
riff: Support ULH0 and ULH2 fourccs.
utvideodec: Support ULH0 and ULH2 formats.
Conflicts:
libavcodec/utvideodec.c
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42b8296f36378c1cbd4fa7d278696196e1c49e5d
---
More information about the ffmpeg-cvslog
mailing list