lavc: fix previous merge