Merge commit '92ba965103d3884609730ba9bf293772dc78a9ef'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 14:36:27 +0000 (15:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 14:36:27 +0000 (15:36 +0100)
commit2d15e0c01dfd36270508a37004b1ef778198dd0c
tree535f5f31138ed3e46c1dccb7887ac39661e7b168
parentb4f64c58fc80585b9dc46f6ac6e385b2d55260a7
parent92ba965103d3884609730ba9bf293772dc78a9ef
Merge commit '92ba965103d3884609730ba9bf293772dc78a9ef'

* commit '92ba965103d3884609730ba9bf293772dc78a9ef':
  dsputil: Move draw_edges and clear_block* out of dsputil_template

Conflicts:
libavcodec/dsputil.c

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