[FFmpeg-cvslog] Merge commit 'f76e3669bb350ca6df150244f3d28d7dc5599f01'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun  1 17:54:28 2014 +0200| [3d820ba9095fe6a28ff25d05776edcbf4b78ed47] | committer: Michael Niedermayer

Merge commit 'f76e3669bb350ca6df150244f3d28d7dc5599f01'

* commit 'f76e3669bb350ca6df150244f3d28d7dc5599f01':
  Decode both parts of Indeo4 IP frames

Conflicts:
	libavcodec/ivi_common.c
	libavcodec/ivi_common.h

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

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