dpcm conflict fix
dpx: fix conflicts
indeo3: resolve confilcts
kmvc: resolve conflicts
kmvc: resolve conflicts
h264: resolve conflicts
4xm: resolve conflicts
012v: convert to refcounted frames
8bps: fix compilation
8svx: resolve conflicts