Merge branch 'master' into 0.11
Conflicts: gst-libs/gst/audio/gstaudiodecoder.c gst-libs/gst/audio/gstaudioencoder.c gst/encoding/gstencodebin.c
Showing
- docs/libs/gst-plugins-base-libs-sections.txt 4 additions, 2 deletionsdocs/libs/gst-plugins-base-libs-sections.txt
- gst-libs/gst/audio/gstaudiodecoder.c 85 additions, 11 deletionsgst-libs/gst/audio/gstaudiodecoder.c
- gst-libs/gst/audio/gstaudiodecoder.h 8 additions, 1 deletiongst-libs/gst/audio/gstaudiodecoder.h
- gst-libs/gst/audio/gstaudioencoder.c 235 additions, 30 deletionsgst-libs/gst/audio/gstaudioencoder.c
- gst-libs/gst/audio/gstaudioencoder.h 16 additions, 2 deletionsgst-libs/gst/audio/gstaudioencoder.h
- gst/typefind/gsttypefindfunctions.c 4 additions, 0 deletionsgst/typefind/gsttypefindfunctions.c
- win32/common/libgstaudio.def 5 additions, 2 deletionswin32/common/libgstaudio.def
Loading
Please register or sign in to comment