Michael Niedermayer d5a3caef93 Merge commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576' ...

* commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576':
  vc1: Split the decoder in components

Conflicts:
	libavcodec/Makefile
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-10-08 22:00:09 +02:00

2.0 KiB

Raw Blame History

View Raw