diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 14:51:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 14:51:44 +0100 |
| commit | 3e1f24131ac018c8b4bcc852a02ccfadf20d1dbb (patch) | |
| tree | 4fa15874bb03d2c88291ff5b9836cc1d189c2981 /libavdevice/decklink_enc.cpp | |
| parent | 82e6660ae2372cdf96acb3bfebdd82b82f51d23f (diff) | |
| parent | d161ae0a37900cbd36c1390ca32a56b892c02ab5 (diff) | |
| download | ffmpeg-3e1f24131ac018c8b4bcc852a02ccfadf20d1dbb.tar.gz | |
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>
Diffstat (limited to 'libavdevice/decklink_enc.cpp')
0 files changed, 0 insertions, 0 deletions