Merge commit '5639ed9abb58311f82cf3499b682d228290adb09'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 20:45:44 +0000 (21:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 20:45:44 +0000 (21:45 +0100)
commitd0b0fe6691fc67a95f985cad10d7e66c9bc23587
treed7315fb6d3b0b0c1e1a0e67b11eca86cbbb9e62d
parent1537d0b432d8cad62b6c8af1960674ac452be7ac
parent5639ed9abb58311f82cf3499b682d228290adb09
Merge commit '5639ed9abb58311f82cf3499b682d228290adb09'

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

Conflicts:
libavformat/mov.c

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