Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Jul 2013 12:08:06 +0000 (14:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Jul 2013 12:08:06 +0000 (14:08 +0200)
commitfcbf16a76f3524189e4a6aa93db7147a4b367e10
treead67c533df3790283596e7d0ea7567e81351ff87
parentc4b904caeaa7664870030c3015e1593f90112c9c
parent5b2a29552ca09edd4646b6aa1828b32912b7ab36
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  indeo: Reject impossible FRAMETYPE_NULL

Conflicts:
libavcodec/ivi_common.c

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