diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-31 13:06:53 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-31 13:06:53 -0300 |
| commit | 51e091e2dcf11171615b5d67aeba6b8e5d04de37 (patch) | |
| tree | ebe6ebff88f8a4cce653cce696868fc9a6b6965b /libavcodec/proresdata.c | |
| parent | b1ab02895b121b92dc3483c79e45eb5ea686f3aa (diff) | |
| parent | 3d040513a1de4797a4f81dde4984395f51db76b7 (diff) | |
| download | ffmpeg-51e091e2dcf11171615b5d67aeba6b8e5d04de37.tar.gz | |
Merge commit '3d040513a1de4797a4f81dde4984395f51db76b7'
* commit '3d040513a1de4797a4f81dde4984395f51db76b7':
avutil/hwcontext_dxva2: Don't improperly free IDirect3DSurface9 objects
decode: fix the code reducing cropping to preserve alignment
This commit is a noop, see
02327d1237f19619272e7b04b715e807c16af6a5
0c1c514643d5e1645160d697fa4c27cd38c7c791
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/proresdata.c')
0 files changed, 0 insertions, 0 deletions