[FFmpeg-cvslog] Merge commit 'f6f36ca8ca1b2526d3abff7d7c627322d3bce912'
Michael Niedermayer
git at videolan.org
Fri Jul 5 11:58:06 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 5 11:49:56 2013 +0200| [0e2056056fc8d70046c6e3a83c94c3f1b4ea70a4] | committer: Michael Niedermayer
Merge commit 'f6f36ca8ca1b2526d3abff7d7c627322d3bce912'
* commit 'f6f36ca8ca1b2526d3abff7d7c627322d3bce912':
indeo: Refactor ff_ivi_dec_huff_desc
Conflicts:
libavcodec/ivi_common.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e2056056fc8d70046c6e3a83c94c3f1b4ea70a4
---
More information about the ffmpeg-cvslog
mailing list