Merge commit 'd1dd0d404c085f4fce7b8358b4aea677761c5d88'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Jun 2015 18:58:26 +0000 (20:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Jun 2015 18:58:32 +0000 (20:58 +0200)
* commit 'd1dd0d404c085f4fce7b8358b4aea677761c5d88':
  mpegvideo: Move block permutation function where is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c

Simple merge
@@@ -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;
Simple merge