Merge commit 'd1dd0d404c085f4fce7b8358b4aea677761c5d88'

* commit 'd1dd0d404c085f4fce7b8358b4aea677761c5d88':
  mpegvideo: Move block permutation function where is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/mpegvideo.c
Simple merge

diff --cc libavcodec/mpegvideo.h
index 95ddc0f6660de1b25d901592c99043b0de9442ed,1a6857dd425e2a5656ce75a6f0e65fc8e5c6a382..e538695a98b1db9c20ae8b6380b156fbb9a82600
--- 1/libavcodec/mpegvideo.h
--- 2/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@@ -674,14 -638,8 +674,8 @@@ 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;
 +    const int block_size= 8 >> s->avctx->lowres;
  
      s->block_index[0]+=2;
      s->block_index[1]+=2;

diff --cc libavcodec/mpegvideo_enc.c
Simple merge