Merge commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6'
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 23 Jul 2015 09:43:49 +0000 (11:43 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 23 Jul 2015 09:43:56 +0000 (11:43 +0200)
commit40e8ade9ebda8286a0291c575c874755670ce81f
tree8d0e0b22cbe9d04da4e590a8a0d07bc20af081f4
parentcd4c878934a632dba2fe75a78e843b0f729fc79f
parentaed7715b8fa295980c221f1cd095d42cd3bd74a6
Merge commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6'

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

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/asfdec_o.c