Merge commit '0a8f91b1fbc1b627d8db8c734c812beb32102936'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 23:07:42 +0000 (00:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 23:07:47 +0000 (00:07 +0100)
* commit '0a8f91b1fbc1b627d8db8c734c812beb32102936':
  dsputil: Remove disabled avg_no_rnd_qpel leftovers

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

Simple merge