Merge commit 'f76e3669bb350ca6df150244f3d28d7dc5599f01'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jun 2014 15:54:28 +0000 (17:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jun 2014 15:54:47 +0000 (17:54 +0200)
* 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@gmx.at>

Trivial merge