Merge commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 13:51:44 +0000 (14:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 13:51:44 +0000 (14:51 +0100)
commit3e1f24131ac018c8b4bcc852a02ccfadf20d1dbb
tree4fa15874bb03d2c88291ff5b9836cc1d189c2981
parent82e6660ae2372cdf96acb3bfebdd82b82f51d23f
parentd161ae0a37900cbd36c1390ca32a56b892c02ab5
Merge commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5'

* commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5':
  frame: add a function for removing side data from a frame

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavutil/frame.c
libavutil/frame.h
libavutil/version.h