Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: timvideos/gst-switch
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7856cc89ba33
Choose a base ref
...
head repository: timvideos/gst-switch
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 42cdae47d12e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 21, 2015

  1. Fixed a bug in gstswitch.VideoPipeline that adds the time overlay t… 

    …wice if both the time and clock overlay are enabled.
    @software-opal
    software-opal committed Jan 21, 2015

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    72b98af View commit details

  2. Merge pull request #177 from leesdolphin/fix-failing-unittests 

    Fixed a bug in `gstswitch.VideoPipeline` that adds the time overlay twice
    @mithro
    mithro committed Jan 21, 2015
    Copy the full SHA
    42cdae4 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 python-api/gstswitch/testsource.py
4 changes: 2 additions & 2 deletions python-api/gstswitch/testsource.py
View file
Original file line number Diff line number Diff line change
@@ -97,11 +97,11 @@ def __init__(
vfilter.link(_timeoverlay)
_timeoverlay.link(_clockoverlay)
_clockoverlay.link(gdppay)
if timeoverlay:
elif timeoverlay:
self.add(_timeoverlay)
vfilter.link(_timeoverlay)
_timeoverlay.link(gdppay)
if clockoverlay:
elif clockoverlay:
self.add(_clockoverlay)
vfilter.link(_clockoverlay)
_clockoverlay.link(gdppay)