Merge pull request #366 from asmorkalov:gstreamer_codec_list
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 30 Jan 2013 10:41:21 +0000 (14:41 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 30 Jan 2013 10:41:22 +0000 (14:41 +0400)

Trivial merge