Merge commit 'e0caa1eb4e518111a81801db0d2ccdd2733ba94b'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Oct 2014 02:37:27 +0000 (04:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Oct 2014 02:37:27 +0000 (04:37 +0200)
* commit 'e0caa1eb4e518111a81801db0d2ccdd2733ba94b':
  matroskadec: check return values

Conflicts:
libavformat/matroskadec.c

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

Simple merge