Fixed merged patch.
Fixed merged patch.
Added omxplayer patch.