Michael Niedermayer 2e88f82a8a Merge commit '92e598a57a7ce4b8ac9ea56274af39f5fd888311' ...

* commit '92e598a57a7ce4b8ac9ea56274af39f5fd888311':
  prores: Drop DSP infrastructure for prores encoder bits

Conflicts:
	libavcodec/Makefile
	libavcodec/proresdsp.c
	libavcodec/proresenc_kostya.c

Note, these changes only affect one of the 2 prores encoders we have
If someone wants to add optimizations to the affected encoder, or needs/wants
this infrastructure, then iam happy to revert this

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

2014-02-28 18:02:00 +01:00

2.3 KiB

Raw Blame History

View Raw