Merge commit '189157c3fc8eeb691e3684b09d971eb5ddb47d5b'
authorJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 18:46:23 +0000 (15:46 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 18:49:38 +0000 (15:49 -0300)
commit269ed71e93a4eb96cbdf3720311708fb613999d1
tree4f4b52215586272832a14f5db25c148b34216e93
parent162989521ce2cbb19f2b255be3248cbcbaac5fc2
parent189157c3fc8eeb691e3684b09d971eb5ddb47d5b
Merge commit '189157c3fc8eeb691e3684b09d971eb5ddb47d5b'

* commit '189157c3fc8eeb691e3684b09d971eb5ddb47d5b':
  Add ClearVideo decoder

See a63496cc882428aefafc85d2f60e0908b020bffe

Merged-by: James Almer <jamrial@gmail.com>
doc/general.texi
libavcodec/clearvideo.c