Merge commit '23944d29a22a2cd602753b3705f73011c3bf0b18'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Mar 2015 18:39:01 +0000 (20:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Mar 2015 18:39:08 +0000 (20:39 +0200)
commit98263d751562e3b8cefa6d06eb95f0dee8a205db
tree3ad247f5591a06a9967b362b7dcd0d3e6e7dc6e6
parentf5c7531ab1e69210df69b07ac6b21cb675f13b9e
parent23944d29a22a2cd602753b3705f73011c3bf0b18
Merge commit '23944d29a22a2cd602753b3705f73011c3bf0b18'

* commit '23944d29a22a2cd602753b3705f73011c3bf0b18':
  indeo: Give Indeo4/5 shared code a more consistent name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile
libavcodec/indeo4.c
libavcodec/indeo4data.h
libavcodec/indeo5.c
libavcodec/ivi.c
libavcodec/ivi.h
libavcodec/ivi_dsp.c
libavcodec/ivi_dsp.h