Merge commit 'adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Aug 2014 10:59:02 +0000 (12:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Aug 2014 11:00:41 +0000 (13:00 +0200)
commitbf7ed956ffcd390b3f5ead2b36d47b068f89178f
tree9cdd1e203de9e57536cc3263320506cc69944cec
parent77aafadc5655401e5806daed58300a2cccb19fb8
parentadf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed
Merge commit 'adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed'

* commit 'adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed':
  vc-1: Add platform-specific start code search routine to VC1DSPContext.

Conflicts:
configure
libavcodec/arm/vc1dsp_init_arm.c
libavcodec/vc1dsp.c
libavcodec/vc1dsp.h

See: 9d8ecdd8ca6d248e7439e8fdf255e39eda14e0f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/Makefile
libavcodec/arm/Makefile
libavcodec/arm/vc1dsp_init_arm.c
libavcodec/vc1_parser.c
libavcodec/vc1dsp.c
libavcodec/vc1dsp.h