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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 14 15:57:53 2012 +0100| [3c5c6b9d61361eae3eb989ad8aeca80f0fc05a63] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ivi_common: check that scan pattern is set before using it.

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

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