Merge branch 'master' into devel

Conflicts:
	README.md
This commit is contained in:
jfmcarreira committed 2014-10-03 12:43:00 +01:00
commit d6744da651
1 file changed
+3 -2
+3 -2
View File
@@ -1,6 +1,7 @@
plaYUVer
PlaYUVer - Enhanced raw video player
========
plaYUVer is an open-source video player with the following features:
- Support for libavformat and libavcodec;
- Support for wide range of raw video formats;
@@ -17,7 +18,7 @@ Developers
----------------------------------------------------------------
- Joao Carreira (jfmcarreira@gmail.com)
- Lui­s Lucas (luisfrlucas@gmail.com)
- Lui­s Lucas (luisfrlucas@gmail.com)
Builds