diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-18 11:42:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-18 11:42:42 +0200 |
| commit | 9317b73f11c34e550a2ffcf01540824dbaa36036 (patch) | |
| tree | 0c8cdd8af793ddfb724987d29d50ab079a903c6f /libavformat/ffmetadec.c | |
| parent | 5806cd93651f2066a5c402aadf261211736f1c0c (diff) | |
| parent | 36ac9a16a19a365ce58cc871484c20cffe9b6401 (diff) | |
| download | ffmpeg-9317b73f11c34e550a2ffcf01540824dbaa36036.tar.gz | |
Merge commit '36ac9a16a19a365ce58cc871484c20cffe9b6401'
* commit '36ac9a16a19a365ce58cc871484c20cffe9b6401':
fate: dependencies for seek tests
fate: handle lavf test dependencies entirely in make
Conflicts:
configure
tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ffmetadec.c')
0 files changed, 0 insertions, 0 deletions