[FFmpeg-cvslog] Merge commit '016cac75c6061a1c03f812ddf258b8baefe70b00'

Michael Niedermayer git at videolan.org
Fri Jul 3 04:05:59 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul  3 03:58:29 2015 +0200| [30ffbeb04abde7bcf2ec01566f56dc187a87cad3] | committer: Michael Niedermayer

Merge commit '016cac75c6061a1c03f812ddf258b8baefe70b00'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=30ffbeb04abde7bcf2ec01566f56dc187a87cad3
---





More information about the ffmpeg-cvslog mailing list