[FFmpeg-cvslog] Merge commit 'f9900822fc5f0b0c7242ca318290c090bd5d0af0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 14 22:11:37 2014 +0200| [a65d6e17bd04e11b863c8f80d028af0058440a68] | committer: Michael Niedermayer

Merge commit 'f9900822fc5f0b0c7242ca318290c090bd5d0af0'

* commit 'f9900822fc5f0b0c7242ca318290c090bd5d0af0':
  fate: Use the correct, local path to samples for opus reference files

Conflicts:
	tests/fate/opus.mak

See: ad7de82218e9ee2232e53ab49cda85767cf800e5
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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