Merge commit 'eaeba6f241e0de0e797be10f8fda967ef8489e64'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 24 Apr 2016 11:32:38 +0000 (12:32 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 24 Apr 2016 11:32:38 +0000 (12:32 +0100)
commit36dad146935a500ef6fd7246b5c216f7af26f9db
tree71c6109c6cda64b9a2655d3d5952806fe352c5b2
parente5c655b09817da9388a8812b93e9948c44cc00af
parenteaeba6f241e0de0e797be10f8fda967ef8489e64
Merge commit 'eaeba6f241e0de0e797be10f8fda967ef8489e64'

* commit 'eaeba6f241e0de0e797be10f8fda967ef8489e64':
  intrax8: Pass the output frame to the decoding function

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