diff options
| author | James Almer <jamrial@gmail.com> | 2018-09-02 16:42:57 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-09-02 16:42:57 -0300 |
| commit | 4069096dd535ee99175c2a29c1a1f59c3fc110c1 (patch) | |
| tree | b408870212e8687c2cff34e8cf25f53244f1c6c6 /libswresample/resample_template.c | |
| parent | 22219a3ac46ac18f797c94e4619a34728556786c (diff) | |
| parent | 78149d6657302b58d5e46e8bc0a521ed009f86f7 (diff) | |
| download | ffmpeg-4069096dd535ee99175c2a29c1a1f59c3fc110c1.tar.gz | |
Merge commit '78149d6657302b58d5e46e8bc0a521ed009f86f7'
* commit '78149d6657302b58d5e46e8bc0a521ed009f86f7':
amfenc: Retain a reference to D3D frames used as input during the encoding process
This commit is a noop, see 05f1a3face140373ae658ab1abd6bacc841a770d
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libswresample/resample_template.c')
0 files changed, 0 insertions, 0 deletions