Merge commit '668643b9239c70b777aea322eab411ebc960d9a0'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Sep 2013 07:38:33 +0000 (09:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Sep 2013 07:39:24 +0000 (09:39 +0200)
* commit '668643b9239c70b777aea322eab411ebc960d9a0':
  matroskadec: check av_strdup() when setting defaults

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

Simple merge