aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale/swscale.h
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-10-02 16:00:14 -0300
committerJames Almer <jamrial@gmail.com>2017-10-02 16:00:14 -0300
commit0451c3db4ee21afb437279b656c83269677801e5 (patch)
treed20e44c736e3e31b7ccf18876506a9b19c9767cb /libswscale/swscale.h
parentff29db4ebf2245a33e184d79ebb294c71d42ea1f (diff)
parent04d2afa93b6c6f320ac45dd99ce1226f3c3d5ac8 (diff)
downloadffmpeg-0451c3db4ee21afb437279b656c83269677801e5.tar.gz
Merge commit '04d2afa93b6c6f320ac45dd99ce1226f3c3d5ac8'
* commit '04d2afa93b6c6f320ac45dd99ce1226f3c3d5ac8': mkv: Update the seek test to match 5d3953a5dc fate: Update fate-lavf-mkv after commit 5d3953a5dc 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