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)
* qatar/master:
  ivi_common: check that scan pattern is set before using it.

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

Simple merge