Merge commit 'd6096a67422534918405abb46dafbbac4608cbc3'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 20:59:38 +0000 (21:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 21:06:01 +0000 (22:06 +0100)
* commit 'd6096a67422534918405abb46dafbbac4608cbc3':
  Remove all SH4 architecture optimizations

Conflicts:
libavcodec/sh4/dsputil_sh4.c
libavcodec/sh4/dsputil_sh4.h
libavcodec/sh4/idct_sh4.c
libavcodec/sh4/sh4.h

If someone wants to maintain these (or other) SH4 optimizations, please
contact me or ffmpeg-devel.
I am happy to revert this removial if theres someone considering to
maintain this code.

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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge