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>

diff --cc libavcodec/ivi_common.c
index 7577729,25ca6b7..9d34a46
--- 1/libavcodec/ivi_common.c
--- 2/libavcodec/ivi_common.c
+++ b/libavcodec/ivi_common.c
@@@ -988,10 -958,15 +988,18 @@@ int ff_ivi_decode_frame(AVCodecContext 
                  }
              }
          }
 +        ctx->buf_invalid[ctx->dst_buf] = 0;
+     } else {
+         if (ctx->is_scalable)
+             return AVERROR_INVALIDDATA;
+ 
+         for (p = 0; p < 3; p++) {
+             if (!ctx->planes[p].bands[0].buf)
+                 return AVERROR_INVALIDDATA;
+         }
      }
 +    if (ctx->buf_invalid[ctx->dst_buf])
 +        return -1;
  
      //STOP_TIMER("decode_planes"); }