diff options
| author | James Almer <jamrial@gmail.com> | 2017-09-28 13:03:58 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-09-28 13:03:58 -0300 |
| commit | bf209013bff8f70facd9eada39009eff05f8e202 (patch) | |
| tree | fb14e3249c9f87d72cb26afc10a6deef37d12d53 /libavformat/mkvtimestamp_v2.c | |
| parent | e63e0b65446b16af4f2016fcd034a650f93f4b88 (diff) | |
| parent | 2d518aec4c781316092be65893b47922c8f71b67 (diff) | |
| download | ffmpeg-bf209013bff8f70facd9eada39009eff05f8e202.tar.gz | |
Merge commit '2d518aec4c781316092be65893b47922c8f71b67'
* commit '2d518aec4c781316092be65893b47922c8f71b67':
vf_deinterlace_vaapi: Create filter buffer after context
vaapi_encode: Discard output buffer if picture submission fails
This commit is a noop, see
92bd08974541611731b2d58723826ea26ecbe47d
359586f14f46bf3f9c1ae3375d80e8c0fc377bef
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/mkvtimestamp_v2.c')
0 files changed, 0 insertions, 0 deletions