Merge commit '5d839778b9f3edb682b7f71dde4f80f07c75b098'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 02:57:12 +0000 (03:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 02:57:59 +0000 (03:57 +0100)
commitbce06eb059a22fa1cd76a13112c36a4353894cca
tree0660196a55595b624ce0eae77c39df11b49371f5
parent1137ccef706650138e8f449deb5724e13da7236b
parent5d839778b9f3edb682b7f71dde4f80f07c75b098
Merge commit '5d839778b9f3edb682b7f71dde4f80f07c75b098'

* commit '5d839778b9f3edb682b7f71dde4f80f07c75b098':
  lavu: Refactor side data wiping

Conflicts:
libavutil/frame.c

See: a400edbb6d00c0211de38e4f1b4f593681db91d8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/frame.c