Merge commit 'e7373585f827d4ec05d952daa3877e8decfe3c08'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 13:40:49 +0000 (14:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 13:40:49 +0000 (14:40 +0100)
commit32620691011186a0a3932bba8ddb078ce5312f22
treebad6b8eaaaf727a9ba94c38d8bceab5c8f50e1b1
parent152c8fd856e505119c0a2040a9525715fc255c9a
parente7373585f827d4ec05d952daa3877e8decfe3c08
Merge commit 'e7373585f827d4ec05d952daa3877e8decfe3c08'

* commit 'e7373585f827d4ec05d952daa3877e8decfe3c08':
  dsputil_template: Move bits that are used templatized into separate file

Conflicts:
libavcodec/dsputil_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dsputil.c
libavcodec/dsputil_template.c
libavcodec/dsputilenc_template.c