Merge commit '701e8b42e12ad625c64ceae2252acb1de390278c'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Aug 2014 11:22:34 +0000 (13:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Aug 2014 11:37:07 +0000 (13:37 +0200)
commit9988899993ee6c514749244ff47d43492c42f395
treeea289fb93cb930b4934c16daf642f1ed39ddeb64
parentbf7ed956ffcd390b3f5ead2b36d47b068f89178f
parent701e8b42e12ad625c64ceae2252acb1de390278c
Merge commit '701e8b42e12ad625c64ceae2252acb1de390278c'

* commit '701e8b42e12ad625c64ceae2252acb1de390278c':
  vc-1: Optimise parser (with special attention to ARM)

Conflicts:
libavcodec/vc1_parser.c

See: a0d7f9ec9a10d935b83a47dbcb2cd85dcc007738
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vc1_parser.c