Merge commit '9fa888c02801fff2e8817c24068f5296bbe60000'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sat, 7 May 2016 20:38:30 +0000 (21:38 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sat, 7 May 2016 20:39:44 +0000 (21:39 +0100)
commitf110c624b1f30ac7f817eda128db1265260e57c7
tree22408a510dd65e4febf8c9f279419fb659b6c0b5
parentc59c7924707e2a28f2e777c2f7c284078feae967
parent9fa888c02801fff2e8817c24068f5296bbe60000
Merge commit '9fa888c02801fff2e8817c24068f5296bbe60000'

* commit '9fa888c02801fff2e8817c24068f5296bbe60000':
  intrax8: Keep a reference to the decoder blocks

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