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)
commit21d8e2c0b5aa5bae900fcfeb7f29de1d2261c2bd
tree523311bf8fdd47ee226bfd0530fd7863a4b38bdc
parentd784d6b7ed254dd61e4802da7d0c0c2b4894daab
parentd1dd0d404c085f4fce7b8358b4aea677761c5d88
Merge commit 'd1dd0d404c085f4fce7b8358b4aea677761c5d88'

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

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