diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 14:14:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 14:14:06 +0200 |
| commit | 6e83c266201adb15971bc3ad5c6c41fedace08ac (patch) | |
| tree | 32bbcdf299d6970892b34f63bd8c72d763adc5fd /libavformat/utils.c | |
| parent | a4de70df20f094c23d6e3a6cbf6ca85c096b0e03 (diff) | |
| parent | 58d7b835e3cec48ab5a2393405fe82dee72c06a0 (diff) | |
| download | ffmpeg-6e83c266201adb15971bc3ad5c6c41fedace08ac.tar.gz | |
Merge commit '58d7b835e3cec48ab5a2393405fe82dee72c06a0' into release/1.1
* commit '58d7b835e3cec48ab5a2393405fe82dee72c06a0':
fate: Add dependencies for dct/fft/mdct/rdft tests
Conflicts:
libavcodec/fft-test.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions