diff options
| author | James Almer <jamrial@gmail.com> | 2016-09-28 13:22:00 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-09-28 13:22:00 -0300 |
| commit | 32c25f06b79f9edcda726f6e043325d40036cdce (patch) | |
| tree | 46e89e540424ad2111c5d65910d2351645ef67f0 /presets | |
| parent | 0153cc49b20ac6c54d5bcd86f5ce53357e6b29aa (diff) | |
| parent | e85f6f7f8d037c0af0f294000718d9ba22753baa (diff) | |
| download | ffmpeg-32c25f06b79f9edcda726f6e043325d40036cdce.tar.gz | |
Merge commit 'e85f6f7f8d037c0af0f294000718d9ba22753baa'
* commit 'e85f6f7f8d037c0af0f294000718d9ba22753baa':
lavc: allow using AVCodecContext.hw_frames_ctx for decoding
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'presets')
0 files changed, 0 insertions, 0 deletions