Conflicts: ext/theora/gsttheoraenc.c gst-libs/gst/tag/gstexiftag.c gst/adder/gstadder.c gst/adder/gstadder.h gst/playback/gstdecodebin2.c gst/playback/gstsubtitleoverlay.c tests/check/libs/tag.c
Conflicts: ext/theora/gsttheoraenc.c gst-libs/gst/tag/gstexiftag.c gst/adder/gstadder.c gst/adder/gstadder.h gst/playback/gstdecodebin2.c gst/playback/gstsubtitleoverlay.c tests/check/libs/tag.c