Merge commit '0b016eb99d38738e2c53e36549a4732a0f863b2e'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Feb 2013 10:43:23 +0000 (11:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Feb 2013 10:44:46 +0000 (11:44 +0100)
commit55151aa1013b6bf83b82b5535a7d085202fe49b3
tree57a0bbf0c5bb7be975aad8c4d90cdefca4011ed4
parenta35f5c22339c87b1f1cb71201a5c886715a3dc8a
parent0b016eb99d38738e2c53e36549a4732a0f863b2e
Merge commit '0b016eb99d38738e2c53e36549a4732a0f863b2e'

* commit '0b016eb99d38738e2c53e36549a4732a0f863b2e':
  dsputil: Move ff_block_permute to mpegvideo_enc

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