diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-10 20:58:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-10 20:58:32 +0200 |
| commit | 21d8e2c0b5aa5bae900fcfeb7f29de1d2261c2bd (patch) | |
| tree | 523311bf8fdd47ee226bfd0530fd7863a4b38bdc /libavcodec/mpegvideo.h | |
| parent | d784d6b7ed254dd61e4802da7d0c0c2b4894daab (diff) | |
| parent | d1dd0d404c085f4fce7b8358b4aea677761c5d88 (diff) | |
| download | ffmpeg-21d8e2c0b5aa5bae900fcfeb7f29de1d2261c2bd.tar.gz | |
Merge commit 'd1dd0d404c085f4fce7b8358b4aea677761c5d88'
* commit 'd1dd0d404c085f4fce7b8358b4aea677761c5d88':
mpegvideo: Move block permutation function where is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 95ddc0f666..e538695a98 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -674,12 +674,6 @@ void ff_mpv_motion(MpegEncContext *s, op_pixels_func (*pix_op)[4], qpel_mc_func (*qpix_op)[16]); -/** - * 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); - static inline void ff_update_block_index(MpegEncContext *s){ const int block_size= 8 >> s->avctx->lowres; |