diff options
| author | Michael Niedermayer <[email protected]> | 2015-07-13 01:28:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-07-13 01:28:57 +0200 |
| commit | 9e810a98a26391fd32f94e984a0a997ad77b77fe (patch) | |
| tree | 931df66abe50af9087c6b67754bfec0dec25728e /libavutil/mem.c | |
| parent | 99558270ed1e1c0d8906439b47085860ee0b08bd (diff) | |
| parent | 650060dfb665552442ec11b456660e3e9a9d9016 (diff) | |
Merge commit '650060dfb665552442ec11b456660e3e9a9d9016'
* commit '650060dfb665552442ec11b456660e3e9a9d9016':
hevc_parser: parse and export some stream parameters
Conflicts:
configure
libavcodec/hevc_parser.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavutil/mem.c')
0 files changed, 0 insertions, 0 deletions