Fix conflict in cherry-pic commit 388e881ba9143.. : vaapidecoder_mpeg2
authorSreerenj Balachandran <sreerenj.balachandran@intel.com>
Mon, 5 Nov 2012 10:19:40 +0000 (12:19 +0200)
committerSreerenj Balachandran <sreerenj.balachandran@intel.com>
Mon, 5 Nov 2012 10:19:40 +0000 (12:19 +0200)
commitc7c7474383cc214d10b2f72d517e96160bbb1a31
treeaeae78a9a3c1f7663b302a76c202a1869bbf48ff
parent468c835e689158aff145734c1f9530565c5e51a8
Fix conflict in cherry-pic commit 388e881ba9143.. : vaapidecoder_mpeg2
gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.c