Merge commit '1eaae7abb8f208fefb4e8b9e983e61b2499206a3'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 24 Apr 2016 11:34:58 +0000 (12:34 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 24 Apr 2016 11:34:58 +0000 (12:34 +0100)
commit52692eed615cc6dd05edae5505044401059408a0
tree90f11cee3af67ac92a3bb963d3b544b58c2f113d
parent50fa5715bcc3e63143e8ae8d1ef57d9e0e6a6325
parent1eaae7abb8f208fefb4e8b9e983e61b2499206a3
Merge commit '1eaae7abb8f208fefb4e8b9e983e61b2499206a3'

* commit '1eaae7abb8f208fefb4e8b9e983e61b2499206a3':
  intrax8: Reference the current AVCodecContext

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