]> git.sesse.net Git - ffmpeg/commit
Merge commit 'ee80f834cbb6dbacdc1efb4c658a7d775e82ebff'
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 23 Jul 2015 09:34:36 +0000 (11:34 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 23 Jul 2015 09:34:40 +0000 (11:34 +0200)
commitcd4c878934a632dba2fe75a78e843b0f729fc79f
treeebd186dbdbc495b1b67ce57bd6a4368e0790fb9a
parenta176bbc873b13430c683625744cb15bd659fcd58
parentee80f834cbb6dbacdc1efb4c658a7d775e82ebff
Merge commit 'ee80f834cbb6dbacdc1efb4c658a7d775e82ebff'

* commit 'ee80f834cbb6dbacdc1efb4c658a7d775e82ebff':
  asfdec: set nb_streams to 0 in the asf_read_close

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