diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 22:14:56 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 22:15:41 +0200 |
commit | 707cfea37497ca7b1debc20fcf9b720ac5612d01 (patch) | |
tree | be084e4394c13c6621c741f58ebd8e6f995f12e8 | |
parent | ebefc92a3dcd88d2b5e97c221f7d1cff657a1e60 (diff) | |
parent | 42a8d326978f6cf64fdc6deec8a3d91e5e1eaf07 (diff) | |
download | ffmpeg-707cfea37497ca7b1debc20fcf9b720ac5612d01.tar.gz |
Merge commit '42a8d326978f6cf64fdc6deec8a3d91e5e1eaf07' into release/1.1
* commit '42a8d326978f6cf64fdc6deec8a3d91e5e1eaf07':
movdec: handle 0x7fff langcode as macintosh per the specs
See: e636aa1a56bcd91242c25282dcb00929196470eb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions