diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-19 04:15:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-19 04:15:38 +0200 |
| commit | a86d527c8b37d303f6ee73ac2e7025cb0cbea14c (patch) | |
| tree | 009614e4bdd71658408b280400a68c415ff02818 /libavformat/lrcenc.c | |
| parent | 69c7aad494683953e833e8622776e3bbcc7921ed (diff) | |
| parent | e0a2e60c0a6cbcceef08e94af5081d2aa8e6a52f (diff) | |
| download | ffmpeg-a86d527c8b37d303f6ee73ac2e7025cb0cbea14c.tar.gz | |
Merge commit 'e0a2e60c0a6cbcceef08e94af5081d2aa8e6a52f'
* commit 'e0a2e60c0a6cbcceef08e94af5081d2aa8e6a52f':
dct-test: Reuse enum idct_permutation_type instead of duplicating it
Conflicts:
libavcodec/dct-test.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/lrcenc.c')
0 files changed, 0 insertions, 0 deletions