Merge commit '8435bca087c0e79385763c51de009fd89390b6a5'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Jul 2013 10:34:07 +0000 (12:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Jul 2013 10:38:54 +0000 (12:38 +0200)
commit54623619373d316136d184153d0d7387acef6426
treea2e0cd94f3a860e24a5a2afab742d5777afe0d42
parentac20ba35e37dac843c9692a02a63e6a6e3bcce36
parent8435bca087c0e79385763c51de009fd89390b6a5
Merge commit '8435bca087c0e79385763c51de009fd89390b6a5'

* commit '8435bca087c0e79385763c51de009fd89390b6a5':
  indeo4: Do not access missing reference MV

Conflicts:
libavcodec/indeo4.c

See: 5216245aaae44fb4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/indeo4.c