OSDN Git Service

Merge commit 'b1268e0f032a3af3912fe3fb8d3855e12d7ea83b'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sat, 7 May 2016 20:36:46 +0000 (21:36 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sat, 7 May 2016 20:36:54 +0000 (21:36 +0100)
commit123fef54cc8fdadc70829ab12f587e4b64cdbc96
treea7e7fdb0590c0708b02cf6d3e3fee75685f5da4b
parent578fb5a27d4523c958a1907787b659883a2d9b5b
parentb1268e0f032a3af3912fe3fb8d3855e12d7ea83b
Merge commit 'b1268e0f032a3af3912fe3fb8d3855e12d7ea83b'

* commit 'b1268e0f032a3af3912fe3fb8d3855e12d7ea83b':
  intrax8: Pass macroblock coordinates to ff_intrax8_decode_picture

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