Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Dec 2012 14:57:53 +0000 (15:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Dec 2012 15:05:12 +0000 (16:05 +0100)
commit3c5c6b9d61361eae3eb989ad8aeca80f0fc05a63
tree1ebac491e229ac9bc174ab0f87334200b426eaa6
parentbe26232efa9543106bfc16f45831f69abaf1c552
parentdeabb52ab4c1fdb3dd319f3980b1489a182011f1
Merge remote-tracking branch 'qatar/master'

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

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