[FFmpeg-cvslog] Merge commit '3ef6c5264b2590781b4ed556443ff49709dd45fb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 18 13:24:55 2014 +0200| [47a721348a5feae818127b821b6cfc47074938d7] | committer: Michael Niedermayer

Merge commit '3ef6c5264b2590781b4ed556443ff49709dd45fb'

* commit '3ef6c5264b2590781b4ed556443ff49709dd45fb':
  a64: check that extradata exists before reading from it

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

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