Merge commit 'c0fd2fb27bebd1d5ab028e6df6bca9119d269122'
authorClément Bœsch <u@pkh.me>
Tue, 24 Jan 2017 18:23:48 +0000 (19:23 +0100)
committerClément Bœsch <u@pkh.me>
Tue, 24 Jan 2017 18:23:48 +0000 (19:23 +0100)
commit4ad5b9363fcfb06ed34fc95f11837986edd3de6a
tree3742df187e442e2db9518e072483c1aac72abd65
parent9f1c81e5ec90fcfa7efc088d769b9e339a252bfb
parentc0fd2fb27bebd1d5ab028e6df6bca9119d269122
Merge commit 'c0fd2fb27bebd1d5ab028e6df6bca9119d269122'

* commit 'c0fd2fb27bebd1d5ab028e6df6bca9119d269122':
  swscale: Rename sws_context_class to ff_sws_context_class

This commit is a noop, see 8bfbc8c5e504ef3ae914499646d450987b419385

Merged-by: Clément Bœsch <u@pkh.me>