[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 15 14:08:06 2013 +0200| [fcbf16a76f3524189e4a6aa93db7147a4b367e10] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  indeo: Reject impossible FRAMETYPE_NULL

Conflicts:
	libavcodec/ivi_common.c

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

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