← Back to branch summary

~thomas-voss/media-hub/add-tests-and-testing-infrastructure

~thomas-voss/media-hub/add-tests-and-testing-infrastructure

Viewing all changes in revision 117.

Committer: thomas-voss
Date: 2015-01-29 12:28:23 UTC
mfrom: (112.1.3 decouple-service-skeleton-and-implementation)
Revision ID: thomas.voss@canonical.com-20150129122823-v2jh985b1dzw7xtm

Merge prereq branch.

files modified:
src/core/media/external_services.h

src/core/media/player_stub.cpp

src/core/media/video/hybris_gl_sink.cpp

src/core/media/video/hybris_gl_sink.h

src/core/media/video/platform_default_sink.cpp

src/core/media/video/platform_default_sink.h

Show diffs side-by-side

added added

removed removed

src/core/media/external_services.h

src/core/media/player_stub.cpp

src/core/media/video/hybris_gl_sink.cpp

src/core/media/video/hybris_gl_sink.h

src/core/media/video/platform_default_sink.cpp

src/core/media/video/platform_default_sink.h

Older »