Merge commit '62256010'

* commit '62256010': indeo: Refactor ff_ivi_init_tiles and ivi_decode_blocks Conflicts: libavcodec/ivi_common.c Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '62256010'
* commit '62256010': indeo: Refactor ff_ivi_init_tiles and ivi_decode_blocks Conflicts: libavcodec/ivi_common.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
9b10440d · Michael Niedermayer · 0e205605 · 62256010 · 9b10440d
Commit 9b10440d authored Jul 05, 2013 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 162 additions and 126 deletions

ivi_common.c libavcodec/ivi_common.c +162 -126

No files found.
--- a/libavcodec/ivi_common.c
+++ b/libavcodec/ivi_common.c