]> git.sesse.net Git - ffmpeg/commit - libavutil/tests/parseutils.c
Merge commit 'cc06f7bd10c236539b4f6f87b795c459dd873770'
authorJames Almer <jamrial@gmail.com>
Fri, 13 Apr 2018 23:41:00 +0000 (20:41 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 13 Apr 2018 23:41:00 +0000 (20:41 -0300)
commit4339c94364f8ff143d051fcace3e5801625db607
treecaf94b81d8960787b08a629421c05d9110315d0f
parentbbe95ebdadff24127a7c1c9ccf1e7b71aac96cf8
parentcc06f7bd10c236539b4f6f87b795c459dd873770
Merge commit 'cc06f7bd10c236539b4f6f87b795c459dd873770'

* commit 'cc06f7bd10c236539b4f6f87b795c459dd873770':
  libx265: Support tiny video sizes

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/libx265.c