virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
71,420 Commits 37 Branches 400 Tags 460 MiB
c919cc61a1
Commit Graph

3 Commits

Author SHA1 Message Date
Michael Niedermayer
adfde9a646 avformat/avienc: Fix wrongly placed comment 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-19 17:30:28 +01:00
Michael Niedermayer
7711f19eda Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6' 
* commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6':
  fate-seek: remove use of gnu make 3.82 only private modifier
  fate: move vsynth reference files to their own directory
  fate: move fate-acodec reference files to their own dir
  configure: avplay now depends on avresample
  fate: split dependencies for fate-seek tests

Conflicts:
	configure
	tests/fate/seek.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-03 02:33:27 +01:00
Janne Grunau
abab0435d4 fate: split dependencies for fate-seek tests 
Each fate-seek test depends now only on the corresponding fate-acodec,
fate-vsynth2 or fate-lavf test which creates the file seek-tests
operates on. The tests and references are renamed to match the test they
depend on.
 2012-12-02 23:25:41 +01:00