Merge commit '470cd0c5fe6337b6cb5276b3f84400999450fc1b'
authorClément Bœsch <u@pkh.me>
Thu, 14 Jul 2016 17:17:09 +0000 (19:17 +0200)
committerClément Bœsch <u@pkh.me>
Thu, 14 Jul 2016 17:27:39 +0000 (19:27 +0200)
commit93c13886a2d679a88bdecfd9ca39c0120f71fcb9
tree9cb856ec39482b8f4477c2db5ea6935fab1d7f87
parent87e9cefa9110bf16909194666a79587027a2d319
parent470cd0c5fe6337b6cb5276b3f84400999450fc1b
Merge commit '470cd0c5fe6337b6cb5276b3f84400999450fc1b'

* commit '470cd0c5fe6337b6cb5276b3f84400999450fc1b':
  Add TrueMotion 2.0 Real Time decoder

Merged-by: Clément Bœsch <u@pkh.me>
doc/general.texi
libavcodec/truemotion2rt.c