Merge commit 'bc143ce1ac3f8cd851a7e6be69d9a1fbe6b633b6'
authorJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 18:59:31 +0000 (15:59 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 18:59:31 +0000 (15:59 -0300)
commitc060ed02a865e848a8baa0241677021f3840f741
treec62994658ef1d8c54e8f941a1410bd2bd49b589a
parent1198e34e118966d6e64be5801efafad2f629f4ce
parentbc143ce1ac3f8cd851a7e6be69d9a1fbe6b633b6
Merge commit 'bc143ce1ac3f8cd851a7e6be69d9a1fbe6b633b6'

* commit 'bc143ce1ac3f8cd851a7e6be69d9a1fbe6b633b6':
  lavc: Drop deprecated chroma subsample function

This commit is a noop, see 2c800eb7375c65ffd56164b03bb035bdb3f1e172

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