diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 11:43:23 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 11:44:46 +0100 |
commit | 55151aa1013b6bf83b82b5535a7d085202fe49b3 (patch) | |
tree | 57a0bbf0c5bb7be975aad8c4d90cdefca4011ed4 /libavcodec/mpeg4audio.h | |
parent | a35f5c22339c87b1f1cb71201a5c886715a3dc8a (diff) | |
parent | 0b016eb99d38738e2c53e36549a4732a0f863b2e (diff) | |
download | ffmpeg-55151aa1013b6bf83b82b5535a7d085202fe49b3.tar.gz |
Merge commit '0b016eb99d38738e2c53e36549a4732a0f863b2e'
* commit '0b016eb99d38738e2c53e36549a4732a0f863b2e':
dsputil: Move ff_block_permute to mpegvideo_enc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4audio.h')
0 files changed, 0 insertions, 0 deletions