diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 11:43:23 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 11:44:46 +0100 |
commit | 55151aa1013b6bf83b82b5535a7d085202fe49b3 (patch) | |
tree | 57a0bbf0c5bb7be975aad8c4d90cdefca4011ed4 /libavcodec/dsputil.h | |
parent | a35f5c22339c87b1f1cb71201a5c886715a3dc8a (diff) | |
parent | 0b016eb99d38738e2c53e36549a4732a0f863b2e (diff) | |
download | ffmpeg-55151aa1013b6bf83b82b5535a7d085202fe49b3.tar.gz |
Merge commit '0b016eb99d38738e2c53e36549a4732a0f863b2e'
* commit '0b016eb99d38738e2c53e36549a4732a0f863b2e':
dsputil: Move ff_block_permute to mpegvideo_enc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
-rw-r--r-- | libavcodec/dsputil.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 1706af4a7d..47e5b58dc4 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -454,12 +454,6 @@ attribute_deprecated void dsputil_init(DSPContext* c, AVCodecContext *avctx); int ff_check_alignment(void); -/** - * permute block according to permuatation. - * @param last last non zero element in scantable order - */ -void ff_block_permute(int16_t *block, uint8_t *permutation, const uint8_t *scantable, int last); - void ff_set_cmp(DSPContext* c, me_cmp_func *cmp, int type); #define BYTE_VEC32(c) ((c)*0x01010101UL) |