cablelabs/gst-plugins-bad — pull request #2 by lorianderson (2013-08-27 19:20:21+00:00)
Title: Upstream update with conflicts resolved to gstmpdparser.c.

Greg - I talked to Brendan @brendalong and he suggested I create this pull request. The only file that had conflicts was gstmpdparser.c so that's the only one you need to review.