Merge commit '016cac75c6061a1c03f812ddf258b8baefe70b00'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Jul 2015 01:58:29 +0000 (03:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Jul 2015 01:58:33 +0000 (03:58 +0200)
commit30ffbeb04abde7bcf2ec01566f56dc187a87cad3
treea45d0de6ed9c8d89aa15e9698f1eed19df049326
parent7755a5744005e93ea2f59b4f46066b4b9118e90a
parent016cac75c6061a1c03f812ddf258b8baefe70b00
Merge commit '016cac75c6061a1c03f812ddf258b8baefe70b00'

* commit '016cac75c6061a1c03f812ddf258b8baefe70b00':
  asfdec: prevent the infinite loop in detect unknown_subobject

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