diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-07-07 11:10:39 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-07-07 11:10:39 +0200 |
| commit | 26cc33cb629db74d59cd077ffce439dff492f6ca (patch) | |
| tree | 9a4d7655c04f4638958df0a2a0e728ed5e25272a /ext/ogg/gstoggmux.c | |
| parent | 43bee0022a2bff2ce80fb71b613b0549d1085bf0 (diff) | |
| parent | bf816fe81624d31a68d48bba1c48a969cee399f4 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
gst-libs/gst/tag/gstxmptag.c
gst/encoding/gststreamsplitter.c
Diffstat (limited to 'ext/ogg/gstoggmux.c')
0 files changed, 0 insertions, 0 deletions