Merge commit 'ea031b75fb50c59196ccb654c9d143fb75365da9'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 02:33:06 +0000 (04:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 02:33:06 +0000 (04:33 +0200)
commitd8b4e9adbb93211b511e3864d8230789186ef4ed
tree91a10cfd1479528e30f68808ac5b099de2c9262c
parent73e6af9d7b56f12d8676ff919f4acc6c9991d985
parentea031b75fb50c59196ccb654c9d143fb75365da9
Merge commit 'ea031b75fb50c59196ccb654c9d143fb75365da9'

* commit 'ea031b75fb50c59196ccb654c9d143fb75365da9':
  hqx: Move DSP related code to a separate file

Conflicts:
libavcodec/hqx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile
libavcodec/hqx.c
libavcodec/hqx.h
libavcodec/hqxdsp.c
libavcodec/hqxdsp.h