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: ea35e54030e9
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: dc718f57c022
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 8, 2015

  1. Adding queues needed for smooth recording.

    @mithro
    mithro committed Jan 8, 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
    c92433c View commit details

  2. Merge remote-tracking branch 'upstream/master' into output-format-fix

    @mithro
    mithro committed Jan 8, 2015
    Copy the full SHA
    1af9184 View commit details

  3. Merge pull request #98 from mithro/output-format-fix 

    Queues on output are needed to make sure output of the interXXXXsinks are not missed.
    @mithro
    mithro committed Jan 8, 2015
    Copy the full SHA
    dc718f5 View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 tools/gstrecorder.c
2 changes: 2 additions & 0 deletions tools/gstrecorder.c
View file
Original file line number Diff line number Diff line change
@@ -293,6 +293,7 @@ gst_recorder_get_pipeline_string (GstRecorder * rec)
g_string_append_printf (
desc,
"! video/x-raw,width=%d,height=%d ", rec->width, rec->height);
g_string_append_printf (desc, "! queue2 ");
g_string_append_printf (desc, "! jpegenc quality=100 ");
g_string_append_printf (desc, "! mux. ");
g_string_append_printf (desc, "\n");
@@ -301,6 +302,7 @@ gst_recorder_get_pipeline_string (GstRecorder * rec)
g_string_append_printf (
desc,
"interaudiosrc name=source_audio channel=composite_audio ");
g_string_append_printf (desc, "! queue2 ");
g_string_append_printf (desc, "! mux. ");
g_string_append_printf (desc, "\n");