[FFmpeg-cvslog] Merge commit '5bcd3ae5b167fb74215520b01d5d810e0c8986ab'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep  4 12:06:36 2013 +0200| [233ab0f02a316e3f7d515089d5d5dbc4a895ac11] | committer: Michael Niedermayer

Merge commit '5bcd3ae5b167fb74215520b01d5d810e0c8986ab'

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

Conflicts:
	libavformat/matroskadec.c

See: 01fd1aa0ad2b95045df35f94ee9de073d24609c8
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=233ab0f02a316e3f7d515089d5d5dbc4a895ac11
---