Merge commit '92e598a57a7ce4b8ac9ea56274af39f5fd888311'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 16:54:32 +0000 (17:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 17:02:00 +0000 (18:02 +0100)
commit2e88f82a8a50b21a3273785ac1349fd94c1a8aa0
tree2b67d8e5bb10e18729dddfcd1a25b5ea13e17490
parent18d870da83b172c89495b6543001b2ecdf4ae1e2
parent92e598a57a7ce4b8ac9ea56274af39f5fd888311
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>
libavcodec/Makefile
libavcodec/proresdsp.c
libavcodec/proresdsp.h
libavcodec/proresenc_kostya.c