diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-30 20:35:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-30 20:35:23 +0200 |
| commit | 3ef8b4322cba2ebf9fd6b1c15d068ee90e9f9f96 (patch) | |
| tree | cd02323983a8c39384ea05a4113afd86dca8031d /libavformat/bintext.c | |
| parent | 9dc112e277fd67e05044b34ce9fb3177905f2db5 (diff) | |
| parent | d396987c303bdc4eea7d1a1ff6776475d9bbd9ea (diff) | |
| download | ffmpeg-3ef8b4322cba2ebf9fd6b1c15d068ee90e9f9f96.tar.gz | |
Merge commit 'd396987c303bdc4eea7d1a1ff6776475d9bbd9ea' into release/2.2
* commit 'd396987c303bdc4eea7d1a1ff6776475d9bbd9ea':
fate: Add dependencies for dct/fft/mdct/rdft tests
Conflicts:
libavcodec/fft-test.c
tests/fate/fft.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/bintext.c')
0 files changed, 0 insertions, 0 deletions