[FFmpeg-cvslog] Merge commit 'd256ed78ffe202a4dcc8d625becffc716bfa3977'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 18 13:09:42 2014 +0200| [6a510909242a48027dd3ed88b8844d339d17a1de] | committer: Michael Niedermayer

Merge commit 'd256ed78ffe202a4dcc8d625becffc716bfa3977'

* commit 'd256ed78ffe202a4dcc8d625becffc716bfa3977':
  4xm: allocate extradata properly.

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

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