Merge pull request #445 from google/dev

dev -> dev-webm-vp9-opus
This commit is contained in:
ojw28 2015-05-11 21:29:12 +01:00
commit e7bb9dc0d8

View File

@ -10,21 +10,24 @@ SmoothStreaming adaptive playbacks, persistent caching and custom renderers.
Unlike the MediaPlayer API, ExoPlayer is easy to customize and extend, and
can be updated through Play Store application updates.
## Blog ##
Read news, hints and tips in the ExoPlayer [blog][].
[blog]: https://google.github.io/ExoPlayer/blog.html
## Developer guide ##
The [ExoPlayer developer guide][] provides a wealth of information to help you
get started.
[ExoPlayer developer guide]: http://developer.android.com/guide/topics/media/exoplayer.html
The ExoPlayer [developer guide][] provides a wealth of information to help
you get started.
[developer guide]: https://google.github.io/ExoPlayer/guide.html
## Reference documentation ##
[Class reference][] (Documents the ExoPlayer library classes).
[Class reference]: http://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer/package-summary.html
The Exoplayer [class reference][] documents the ExoPlayer library classes.
[class reference]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer/package-summary.html
## Project branches ##
@ -35,7 +38,6 @@ get started.
[master]: https://github.com/google/ExoPlayer/tree/master
[dev]: https://github.com/google/ExoPlayer/tree/dev
## Using Eclipse ##
The repository includes Eclipse projects for both the ExoPlayer library and its