diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 03:57:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 03:57:59 +0100 |
| commit | bce06eb059a22fa1cd76a13112c36a4353894cca (patch) | |
| tree | 0660196a55595b624ce0eae77c39df11b49371f5 /libavutil/bprint.c | |
| parent | 1137ccef706650138e8f449deb5724e13da7236b (diff) | |
| parent | 5d839778b9f3edb682b7f71dde4f80f07c75b098 (diff) | |
| download | ffmpeg-bce06eb059a22fa1cd76a13112c36a4353894cca.tar.gz | |
Merge commit '5d839778b9f3edb682b7f71dde4f80f07c75b098'
* commit '5d839778b9f3edb682b7f71dde4f80f07c75b098':
lavu: Refactor side data wiping
Conflicts:
libavutil/frame.c
See: a400edbb6d00c0211de38e4f1b4f593681db91d8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/bprint.c')
0 files changed, 0 insertions, 0 deletions