Merge commit '6202e2fede75df92cbc374a3f7d6893d0c5ac721'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 17:51:58 +0000 (18:51 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 17:51:58 +0000 (18:51 +0100)
commit1117d6f4b122aa4189c27e3568154e029dfdcbe7
treea42e3d85e5cbf7eedb3505e8ea9126b7caf2c6d4
parent98e3153fa3a190df5c0a2173e134f81299606819
parent6202e2fede75df92cbc374a3f7d6893d0c5ac721
Merge commit '6202e2fede75df92cbc374a3f7d6893d0c5ac721'

* commit '6202e2fede75df92cbc374a3f7d6893d0c5ac721':
  indeo4: Rework stream analysis report

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