[FFmpeg-cvslog] Merge commit '62256010e9bc8879e2bf7f3b94af8ff85e239082'

Michael Niedermayer git at videolan.org
Fri Jul 5 12:08:26 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul  5 12:02:53 2013 +0200| [9b10440dcd1a250c0c00cfcd83ae62a4ae6d2544] | committer: Michael Niedermayer

Merge commit '62256010e9bc8879e2bf7f3b94af8ff85e239082'

* commit '62256010e9bc8879e2bf7f3b94af8ff85e239082':
  indeo: Refactor ff_ivi_init_tiles and ivi_decode_blocks

Conflicts:
	libavcodec/ivi_common.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b10440dcd1a250c0c00cfcd83ae62a4ae6d2544
---





More information about the ffmpeg-cvslog mailing list