Merge commit '600b854ad8173995518bd917e7f86120b5505088'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 21:17:54 +0000 (22:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 21:17:54 +0000 (22:17 +0100)
commitd6d3cfb0aa23c1f6111f71889256874d86c2cf77
treed8bc1f0e3b4c07264d07f6f95b030db68b3df829
parent8fbc6e59118d2cc10a712ea8de0e10d2d984bcee
parent600b854ad8173995518bd917e7f86120b5505088
Merge commit '600b854ad8173995518bd917e7f86120b5505088'

* commit '600b854ad8173995518bd917e7f86120b5505088':
  imgconvert: Move ff_deinterlace_line_*_mmx declarations out of dsputil

Conflicts:
libavcodec/imgconvert.c
libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/imgconvert.c
libavcodec/imgconvert.h
libavcodec/x86/dsputil_x86.h