h264parse: fixup merge
authorMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Mon, 13 Feb 2012 11:26:11 +0000 (12:26 +0100)
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Mon, 13 Feb 2012 17:42:53 +0000 (18:42 +0100)
commit67a8e53aef6d1bc560b0054f08006bb38a1ad07f
tree95c8337a0e17e5fd73c082147c00686f5683ea36
parentcf942f4e1fb128194838677b5153ef7d27be9f54
h264parse: fixup merge
gst/videoparsers/gsth264parse.c