* commit '5bcd3ae5':
  matroskadec: Check that .lang was allocated and set before reading it

Conflicts:
	libavformat/matroskadec.c

See: 01fd1aa0Merged-by: Michael Niedermayer <michaelni@gmx.at>