Merge branch 'master' into 0.11
Conflicts: ext/ogg/gstoggdemux.c ext/pango/gsttextoverlay.c gst-libs/gst/audio/gstaudioencoder.c gst-libs/gst/audio/gstbaseaudiosrc.c gst/playback/gstsubtitleoverlay.c gst/videorate/gstvideorate.c
No related branches found
No related tags found
Showing
- docs/design/design-decodebin.txt 10 additions, 30 deletionsdocs/design/design-decodebin.txt
- ext/ogg/gstoggdemux.c 856 additions, 54 deletionsext/ogg/gstoggdemux.c
- ext/ogg/gstoggdemux.h 27 additions, 0 deletionsext/ogg/gstoggdemux.h
- ext/ogg/gstoggstream.c 14 additions, 4 deletionsext/ogg/gstoggstream.c
- ext/pango/gstbasetextoverlay.c 18 additions, 0 deletionsext/pango/gstbasetextoverlay.c
- ext/theora/gsttheoraenc.c 3 additions, 3 deletionsext/theora/gsttheoraenc.c
- gst-libs/gst/audio/audio.h 8 additions, 0 deletionsgst-libs/gst/audio/audio.h
- gst-libs/gst/audio/gstaudiodecoder.c 1 addition, 1 deletiongst-libs/gst/audio/gstaudiodecoder.c
- gst-libs/gst/audio/gstaudioencoder.c 15 additions, 1 deletiongst-libs/gst/audio/gstaudioencoder.c
- gst-libs/gst/interfaces/colorbalance.c 19 additions, 3 deletionsgst-libs/gst/interfaces/colorbalance.c
- gst-libs/gst/pbutils/gstdiscoverer.h 1 addition, 1 deletiongst-libs/gst/pbutils/gstdiscoverer.h
- gst-libs/gst/rtsp/gstrtspdefs.c 3 additions, 0 deletionsgst-libs/gst/rtsp/gstrtspdefs.c
- gst-libs/gst/rtsp/gstrtspdefs.h 3 additions, 0 deletionsgst-libs/gst/rtsp/gstrtspdefs.h
- gst-libs/gst/tag/tag.h 2 additions, 1 deletiongst-libs/gst/tag/tag.h
- gst/adder/gstadder.c 1 addition, 2 deletionsgst/adder/gstadder.c
- gst/playback/gstdecodebin2.c 143 additions, 76 deletionsgst/playback/gstdecodebin2.c
- gst/playback/gstplaybin2.c 39 additions, 0 deletionsgst/playback/gstplaybin2.c
- gst/playback/gstplaysink.c 1 addition, 2 deletionsgst/playback/gstplaysink.c
- gst/playback/gstsubtitleoverlay.c 159 additions, 52 deletionsgst/playback/gstsubtitleoverlay.c
- gst/subparse/gstsubparse.c 3 additions, 3 deletionsgst/subparse/gstsubparse.c
Loading
Please register or sign in to comment