Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 21:19:51 +0000 (22:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 21:46:22 +0000 (22:46 +0100)
commitbd75651378da81b8d75640c3f12765a4b9369534
treef7ecd397520b6c3705b7b08fca4a1a2a4d05d12f
parentaeaca3816c2677bfdb16cbc6bc55c259ed5028ff
parent0a7fef39fc578bd7c90fd2646299f8cad722ecb1
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  omadec: loosen format probing constraints

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/omadec.c