Merge commit '0372e73f917e72c40b09270f771046fc142be4a7'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 18:31:32 +0000 (19:31 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 18:31:32 +0000 (19:31 +0100)
commitf64b53f2bf5f3f43402564bf57a8555a709d012c
tree05a8fe0d4b141f54dc10798bcf1f89228fdfcb5b
parentc29ac4abb8183513555ff2ee90666c6eac7cbf4f
parent0372e73f917e72c40b09270f771046fc142be4a7
Merge commit '0372e73f917e72c40b09270f771046fc142be4a7'

* commit '0372e73f917e72c40b09270f771046fc142be4a7':
  intrax8: Check and propagate errors from ff_intrax8_common_init

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