diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-11 10:14:11 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-11 10:14:11 -0300 |
| commit | 9194d3d3806f47941109a82ef1ff1f704e8e5b24 (patch) | |
| tree | 3dc65f89f5e41e85de8d8dfca334ccd05ee8d55e /libavcodec/srtdec.c | |
| parent | 672e704e4a409f5174f253f7a463653dd7e9cb7c (diff) | |
| parent | 173b56218f39c6463be0e182259e2deead106936 (diff) | |
| download | ffmpeg-9194d3d3806f47941109a82ef1ff1f704e8e5b24.tar.gz | |
Merge commit '173b56218f39c6463be0e182259e2deead106936'
* commit '173b56218f39c6463be0e182259e2deead106936':
lavf: make avio_read_partial() public
swscale: Do not expand a macro with 'defined' in it
configure: Include d3d11va_extralibs in libavutil
This commit is a noop, see
69218b41980883a7e75656f3058171939f5729ef
add7b3bc3fb7685cd0a3ccffd2b09cc0e32c39ec
5d76674756806e3b458e484788775fcee34aac2a
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/srtdec.c')
0 files changed, 0 insertions, 0 deletions