Merge commit '5d8bea3bb2357bb304f8f771a4107039037c5549'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 08:39:37 +0000 (10:39 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 08:39:37 +0000 (10:39 +0200)
commit9ca19971bcdd1af39680c15a0319d57505b9542b
treeca8ae1eb4d2175869002090081788b0093dc520b
parent52566efd5cf8c40d4e5bf8d54fa3cfdab921baad
parent5d8bea3bb2357bb304f8f771a4107039037c5549
Merge commit '5d8bea3bb2357bb304f8f771a4107039037c5549'

* commit '5d8bea3bb2357bb304f8f771a4107039037c5549':
  xtea: add av_xtea_alloc()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
doc/APIchanges
libavutil/xtea.c
libavutil/xtea.h