aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale/swscale.h
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-05-04 21:38:00 -0300
committerJames Almer <jamrial@gmail.com>2017-05-04 21:38:00 -0300
commit43b136ce80eabcc51e948cd62dec1b5d0e5e7914 (patch)
tree4ba553bb859edae3c3a630330cf0224a550a4183 /libswscale/swscale.h
parentf31f610f337d6e7cdd5dc465b5795127e618c145 (diff)
parent0982152c3fb05365597978c5d7cfeeb7ced01723 (diff)
downloadffmpeg-43b136ce80eabcc51e948cd62dec1b5d0e5e7914.tar.gz
Merge commit '0982152c3fb05365597978c5d7cfeeb7ced01723'
* commit '0982152c3fb05365597978c5d7cfeeb7ced01723': matroskadec: fix SRT subtitle duration This commit is a noop. Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libswscale/swscale.h')
0 files changed, 0 insertions, 0 deletions