Merge commit '8072345e9f86d88fbc4a15c17cb03f1e4701c9a5'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 24 Apr 2016 11:34:16 +0000 (12:34 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 24 Apr 2016 11:34:16 +0000 (12:34 +0100)
commit50fa5715bcc3e63143e8ae8d1ef57d9e0e6a6325
tree42a0d40d95549de461eb1f15165d2317bc1e81a3
parent93c61c980d63101d7ea1664fd83c810e95ffdc06
parent8072345e9f86d88fbc4a15c17cb03f1e4701c9a5
Merge commit '8072345e9f86d88fbc4a15c17cb03f1e4701c9a5'

* commit '8072345e9f86d88fbc4a15c17cb03f1e4701c9a5':
  intrax8: Keep a reference to the GetBitContext reader

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