Merge commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sat, 7 May 2016 20:41:27 +0000 (21:41 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sat, 7 May 2016 20:41:27 +0000 (21:41 +0100)
commite811ebcd9cd5223239d72c07c79d63ec51ac3259
treebfba538af222921c0e0e760cad1be5d7a8d142b0
parentf2c78128395e899b5b1eebe2426ca55d577363f0
parentca8c7591735c0f80cc29e31e2e92cb10228e14c7
Merge commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7'

* commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7':
  intrax8: Remove mpegvideo dependency

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