Merge commit 'cd832f032f945a57a1f1dd385942c2fadc7ce4e5'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 20:26:49 +0000 (21:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 20:26:49 +0000 (21:26 +0100)
commitdaded4f89a7762a685ae3b5119eec14fc24192a9
tree7bf42dc5576ed1e11229175a7c4649abe91e91bb
parent981aa023387ebfaa19ea8079e423d72cd0321b0b
parentcd832f032f945a57a1f1dd385942c2fadc7ce4e5
Merge commit 'cd832f032f945a57a1f1dd385942c2fadc7ce4e5'

* commit 'cd832f032f945a57a1f1dd385942c2fadc7ce4e5':
  ffv1: Drop bogus dependency on dsputil

Conflicts:
configure
libavcodec/ffv1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/ffv1.c
libavcodec/ffv1.h