diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-21 13:33:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-21 13:33:51 +0200 |
| commit | d986c414dea14cef41d83f74b9549202c2efe6be (patch) | |
| tree | 3cf816e6086514f2955ae9bdbfd3e0a461516e6d /libavfilter/avfiltergraph.h | |
| parent | 5b998dae597a7d40a712f0d1add3cc06a2c72b12 (diff) | |
| parent | 81b9bf319226fe03436c80aaa8a2c91767cab7ce (diff) | |
| download | ffmpeg-d986c414dea14cef41d83f74b9549202c2efe6be.tar.gz | |
Merge commit '81b9bf319226fe03436c80aaa8a2c91767cab7ce'
* commit '81b9bf319226fe03436c80aaa8a2c91767cab7ce':
dct-test: Move arch-specific bits into arch-specific subdirectories
Conflicts:
libavcodec/dct-test.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfiltergraph.h')
0 files changed, 0 insertions, 0 deletions