-
Michael Niedermayer authored
* commit '5d839778': lavu: Refactor side data wiping Conflicts: libavutil/frame.c See: a400edbbMerged-by: Michael Niedermayer <michaelni@gmx.at>
bce06eb0
* commit '5d839778': lavu: Refactor side data wiping Conflicts: libavutil/frame.c See: a400edbbMerged-by: Michael Niedermayer <michaelni@gmx.at>