Merge lp://staging/~justinmcp/media-hub/oxide-support into lp://staging/~phablet-team/media-hub/oxide-support
Proposed by
Justin McPherson
| Status: | Merged |
|---|---|
| Approved by: | Jim Hodapp |
| Approved revision: | 45 |
| Merged at revision: | 43 |
| Proposed branch: | lp://staging/~justinmcp/media-hub/oxide-support |
| Merge into: | lp://staging/~phablet-team/media-hub/oxide-support |
| Diff against target: |
209 lines (+87/-8) 8 files modified
src/core/media/engine.h (+3/-0) src/core/media/gstreamer/bus.h (+3/-1) src/core/media/gstreamer/engine.cpp (+7/-0) src/core/media/gstreamer/engine.h (+3/-0) src/core/media/gstreamer/playbin.h (+44/-1) src/core/media/player_implementation.cpp (+1/-5) src/core/media/player_stub.cpp (+1/-1) tests/unit-tests/test-gstreamer-engine.cpp (+25/-0) |
| To merge this branch: | bzr merge lp://staging/~justinmcp/media-hub/oxide-support |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jim Hodapp (community) | code | Approve | |
|
Review via email:
|
|||
Commit message
Support user-agent and cookies headers in http(s) source.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Just one fix needed.