diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 03:58:29 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 03:58:33 +0200 |
commit | 30ffbeb04abde7bcf2ec01566f56dc187a87cad3 (patch) | |
tree | a45d0de6ed9c8d89aa15e9698f1eed19df049326 /cmdutils.c | |
parent | 7755a5744005e93ea2f59b4f46066b4b9118e90a (diff) | |
parent | 016cac75c6061a1c03f812ddf258b8baefe70b00 (diff) | |
download | ffmpeg-30ffbeb04abde7bcf2ec01566f56dc187a87cad3.tar.gz |
Merge commit '016cac75c6061a1c03f812ddf258b8baefe70b00'
* commit '016cac75c6061a1c03f812ddf258b8baefe70b00':
asfdec: prevent the infinite loop in detect unknown_subobject
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions