Merge commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Oct 2014 19:58:42 +0000 (21:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Oct 2014 20:00:09 +0000 (22:00 +0200)
commitd5a3caef93026abebaa73f4b9c747004a1457fd7
treedc24d134264dcc61fd87a0a8779abf3224c0eef0
parent9da679e77fa25487ae37db11f010fde68034e362
parent04d14c9b68b03e8dbc6e3003c1ee06892dd32576
Merge commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576'

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

Conflicts:
libavcodec/Makefile
libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile
libavcodec/vc1.h
libavcodec/vc1_block.c
libavcodec/vc1_loopfilter.c
libavcodec/vc1_mc.c
libavcodec/vc1_pred.c
libavcodec/vc1_pred.h
libavcodec/vc1data.h
libavcodec/vc1dec.c