[FFmpeg-cvslog] Merge commit '42a8d326978f6cf64fdc6deec8a3d91e5e1eaf07' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun May  4 22:14:56 2014 +0200| [707cfea37497ca7b1debc20fcf9b720ac5612d01] | committer: Michael Niedermayer

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 at gmx.at>

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