search

polimediaupv / paella-opencast

This is the Paella player bundled for Opencast.
http://paellaplayer.upv.es/
11 stars 20 forks source link

Livestreaming 1188 #13

Closed phoebem closed 9 years ago

phoebem commented 9 years ago

To support Live Streaming

miesgre commented 9 years ago

Hi @phoebem. I will not merge this pull request because it will apply all your branch to our repository.

I suppose your "live streaming patch" is only the last commit (4d2653a53ca419747038778888408ece41c51f8b) Is it true?

If it is, I can apply only that commit

phoebem commented 9 years ago

Hi Miguel,

I think that there was an error in the pull request that put all our branch onto the repository, My commit is is only about 4 lines to deal with the live streaming.

Thanks Phoebe.

On Apr 20, 2015, at 2:39 AM, Miguel Escriva notifications@github.com wrote:

Hi @phoebem. I will not merge this pull request because it will apply all your branch to our repository.

I suppose your "live streaming patch" is only the last commit (4d2653a) Is it true?

If it it, I can apply only that commit

— Reply to this email directly or view it on GitHub.

miesgre commented 9 years ago

@phoebem Your changes are now in master (commit f00215c7ede16ba97359e93e01defe766c5f9ece) Thanks!