[FFmpeg-cvslog] Merge commit '5639ed9abb58311f82cf3499b682d228290adb09'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Dec  2 21:45:44 2014 +0100| [d0b0fe6691fc67a95f985cad10d7e66c9bc23587] | committer: Michael Niedermayer

Merge commit '5639ed9abb58311f82cf3499b682d228290adb09'

* commit '5639ed9abb58311f82cf3499b682d228290adb09':
  mov: do not truncate the language-prefixed tag

Conflicts:
	libavformat/mov.c

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

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