Merge commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 2 Oct 2013 12:47:17 +0000 (14:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 2 Oct 2013 12:53:00 +0000 (14:53 +0200)
* commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad':
  asfdec: Check the return value of asf_read_stream_properties

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/asfdec.c

Simple merge