]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'eb3c1a94adbc28411610167d3dac583436e50125'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 20:03:03 +0000 (17:03 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 20:03:03 +0000 (17:03 -0300)
* commit 'eb3c1a94adbc28411610167d3dac583436e50125':
  pictor: Correctly check frame dimensions

This commit is a noop, see 8c2ea3030af7b40a3c4275696fb5c76cdb80950a

Merged-by: James Almer <jamrial@gmail.com>

Trivial merge