diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 14:12:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 14:13:18 +0100 |
| commit | 4e40e6128769246ee101e1990be42880a07dda18 (patch) | |
| tree | 2727d0126d551e007881af6f8b0b63e8fa2afc5d /libavutil/timecode.h | |
| parent | 2b5fa0e0be1195926e5e83302a1680c3c28e055a (diff) | |
| parent | e72e8c5a1df61447ac7af750531e96e8b62d02ba (diff) | |
| download | ffmpeg-4e40e6128769246ee101e1990be42880a07dda18.tar.gz | |
Merge commit 'e72e8c5a1df61447ac7af750531e96e8b62d02ba'
* commit 'e72e8c5a1df61447ac7af750531e96e8b62d02ba':
hevc: add hwaccel hooks
Conflicts:
libavcodec/hevc.c
libavcodec/hevc_refs.c
See: b2e9b0f5d4dca93f54fba85f3345970a636e2b82
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/timecode.h')
0 files changed, 0 insertions, 0 deletions