]> git.sesse.net Git - ffmpeg/commit
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)
commit57070d9892adf55b9fa475f377352b2d42e095a6
tree21b5d6751ea0b95165de65d09e2815ab776bbccd
parent65bf9a44d7b0295e03463fd143499ab5b85d0cb7
parent668643b9239c70b777aea322eab411ebc960d9a0
Merge commit '668643b9239c70b777aea322eab411ebc960d9a0'

* commit '668643b9239c70b777aea322eab411ebc960d9a0':
  matroskadec: check av_strdup() when setting defaults

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