Michael Niedermayer
672c610d84
Merge commit 'f9279ee74936b4990fc46287c27816ef828cc06c'
...
* commit 'f9279ee74936b4990fc46287c27816ef828cc06c':
dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h
Conflicts:
libavcodec/imgconvert.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-22 22:23:04 +01:00
Diego Biurrun
f9279ee749
dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h
2014-03-22 06:17:29 -07:00
Michael Niedermayer
f3d3e3fa4e
Merge commit 'eb2b8bce39c93d16a02656238248c6cf697f447f'
...
* commit 'eb2b8bce39c93d16a02656238248c6cf697f447f':
bfin: Use more sensible file names
Conflicts:
libavcodec/bfin/pixels.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 02:12:45 +01:00
Diego Biurrun
eb2b8bce39
bfin: Use more sensible file names
...
Drop non-informative _bfin suffix, rename some files for consistency with
other architectures, rename others to reflect their content.
2014-03-13 08:15:53 -07:00
