OSDN Git Service

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)
* qatar/master:
  omadec: loosen format probing constraints

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

Simple merge