Merge commit 'ad8aa8e6c648b61f01b9f106f27b9d4f3d094345'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 18:30:01 +0000 (19:30 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 18:30:01 +0000 (19:30 +0100)
commitc29ac4abb8183513555ff2ee90666c6eac7cbf4f
tree485f3a0e4fd614fac767be1ca1ac78fcb155d95d
parentba5bcf96124a4933eef170dfe7955809d8d54a64
parentad8aa8e6c648b61f01b9f106f27b9d4f3d094345
Merge commit 'ad8aa8e6c648b61f01b9f106f27b9d4f3d094345'

* commit 'ad8aa8e6c648b61f01b9f106f27b9d4f3d094345':
  intrax8: Move documentation from implementation to header file

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/intrax8.c
libavcodec/intrax8.h