Merge commit 'd0540fd02171a6233d2016b199d013299debf7e3'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sat, 7 May 2016 20:35:20 +0000 (21:35 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sat, 7 May 2016 20:35:20 +0000 (21:35 +0100)
commit578fb5a27d4523c958a1907787b659883a2d9b5b
treef6fdba3aec0a5072b005e848ca801ec34442632a
parenteee5a7cd7d150024ff74fc1ffa78ab5dfb06131c
parentd0540fd02171a6233d2016b199d013299debf7e3
Merge commit 'd0540fd02171a6233d2016b199d013299debf7e3'

* commit 'd0540fd02171a6233d2016b199d013299debf7e3':
  intrax8: Pass macroblock size to ff_intrax8_common_init

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