diff options
| author | Hendrik Leppkes <[email protected]> | 2015-12-17 13:50:36 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <[email protected]> | 2015-12-17 13:50:36 +0100 |
| commit | f95385dd580604aa287b41093edd692f34c7613b (patch) | |
| tree | ae4542337c6b9bd95fb084eb94c97bdfec1c6506 /libavformat/rtmpcrypt.c | |
| parent | b2d8b91cf0a21537c893d52dc487bfd79988f234 (diff) | |
| parent | 5845a8273e4694e0254ad728970b82bb64fd8bc0 (diff) | |
Merge commit '5845a8273e4694e0254ad728970b82bb64fd8bc0'
* commit '5845a8273e4694e0254ad728970b82bb64fd8bc0':
movenc: use the CPB props side data
Merged-by: Hendrik Leppkes <[email protected]>
Diffstat (limited to 'libavformat/rtmpcrypt.c')
0 files changed, 0 insertions, 0 deletions