[FFmpeg-cvslog] Merge commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6'

Michael Niedermayer git at videolan.org
Thu Jul 23 11:51:10 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Jul 23 11:43:49 2015 +0200| [40e8ade9ebda8286a0291c575c874755670ce81f] | committer: Michael Niedermayer

Merge commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6'

* commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6':
  asfdec: increment nb_streams right after the stream allocation

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

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





More information about the ffmpeg-cvslog mailing list