diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-04 19:05:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-04 19:05:28 +0100 |
| commit | 1c9f2ebdcd073a0f23c32c237182c4c81d91056a (patch) | |
| tree | 565e4064d0857c9c6b4609bdbd12513f9961f40a /libswresample/swresample-test.c | |
| parent | ec5a4af560aafd67c80fe1c80af879d4c4cdaa63 (diff) | |
| parent | 62139b14e621f096d0f8ed90920d042b92867e40 (diff) | |
| download | ffmpeg-1c9f2ebdcd073a0f23c32c237182c4c81d91056a.tar.gz | |
Merge commit '62139b14e621f096d0f8ed90920d042b92867e40'
* commit '62139b14e621f096d0f8ed90920d042b92867e40':
fate: Specify the idct to use for the aic-oddsize test
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresample-test.c')
0 files changed, 0 insertions, 0 deletions