OSDN Git Service

Merge commit '36ac9a16a19a365ce58cc871484c20cffe9b6401'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Oct 2012 09:42:42 +0000 (11:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Oct 2012 09:42:42 +0000 (11:42 +0200)
commit9317b73f11c34e550a2ffcf01540824dbaa36036
tree0c8cdd8af793ddfb724987d29d50ab079a903c6f
parent5806cd93651f2066a5c402aadf261211736f1c0c
parent36ac9a16a19a365ce58cc871484c20cffe9b6401
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>
configure
tests/Makefile
tests/fate/avformat.mak
tests/fate/seek.mak