Merge commit 'd256ed78ffe202a4dcc8d625becffc716bfa3977'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 11:09:42 +0000 (13:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 11:10:24 +0000 (13:10 +0200)
commit6a510909242a48027dd3ed88b8844d339d17a1de
treeb5e2ce839e63622944379b9213ff321bf39a7cc7
parent68c05185e229b093bf5c2236c2883cbc296ea938
parentd256ed78ffe202a4dcc8d625becffc716bfa3977
Merge commit 'd256ed78ffe202a4dcc8d625becffc716bfa3977'

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

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