[FFmpeg-cvslog] Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec  3 02:21:08 2012 +0100| [7711f19eda40a7fd1c8a327f1700ffdd115e1667] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7711f19eda40a7fd1c8a327f1700ffdd115e1667
---